devel/py-configobj: Fix building on Python 3

PR:		194125
Submitted by:	Matteo Cypriani
Approved by:	maintainer timeout
This commit is contained in:
John Marino 2014-11-09 09:07:04 +00:00
parent 9fcf1029ed
commit 0ef8724656
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=372347
4 changed files with 88 additions and 5 deletions

View File

@ -3,16 +3,18 @@
PORTNAME= configobj
PORTVERSION= 4.7.2
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://www.voidspace.org.uk/downloads/ \
SF \
${MASTER_SITE_GOOGLE_CODE}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Simple but powerful config file reader and writer
LICENSE= BSD3CLAUSE
USES= python zip
USE_PYTHON= distutils autoplist

View File

@ -0,0 +1,43 @@
--- configobj.py.orig 2010-02-27 21:36:16 UTC
+++ configobj.py
@@ -1641,7 +1641,7 @@
comment = ''
try:
value = unrepr(value)
- except Exception, e:
+ except Exception as e:
if type(e) == UnknownType:
msg = 'Unknown name or type in value at line %s.'
else:
@@ -1654,7 +1654,7 @@
comment = ''
try:
value = unrepr(value)
- except Exception, e:
+ except Exception as e:
if isinstance(e, UnknownType):
msg = 'Unknown name or type in value at line %s.'
else:
@@ -1929,11 +1929,11 @@
raise_errors=True,
file_error=True,
_inspec=True)
- except ConfigObjError, e:
+ except ConfigObjError as e:
# FIXME: Should these errors have a reference
# to the already parsed ConfigObj ?
raise ConfigspecError('Parsing configspec failed: %s' % e)
- except IOError, e:
+ except IOError as e:
raise IOError('Reading configspec failed: %s' % e)
self.configspec = configspec
@@ -2189,7 +2189,7 @@
val,
missing=missing
)
- except validator.baseErrorClass, e:
+ except validator.baseErrorClass as e:
if not preserve_errors or isinstance(e, self._vdtMissingValue):
out[entry] = False
else:

View File

@ -0,0 +1,38 @@
--- validate.py.orig 2010-03-01 23:04:02 UTC
+++ validate.py
@@ -284,7 +284,7 @@
except socket.error:
# bug in inet_aton, corrected in Python 2.4
if ip.strip() == '255.255.255.255':
- return 0xFFFFFFFFL
+ return 0xFFFFFFFF
else:
raise ValueError('Not a good dotted-quad IP: %s' % ip)
return
@@ -316,7 +316,7 @@
import socket, struct
# no need to intercept here, 4294967295L is fine
- if num > 4294967295L or num < 0:
+ if num > 4294967295 or num < 0:
raise ValueError('Not a good numeric IP: %s' % num)
try:
return socket.inet_ntoa(
@@ -739,7 +739,7 @@
elif isinstance(val, (int, long, float, basestring)):
try:
out_params.append(fun(val))
- except ValueError, e:
+ except ValueError as e:
raise VdtParamError(name, val)
else:
raise VdtParamError(name, val)
@@ -1292,7 +1292,7 @@
raise VdtValueTooLongError(value)
try:
return [fun_dict[arg](val) for arg, val in zip(args, value)]
- except KeyError, e:
+ except KeyError as e:
raise VdtParamError('mixed_list', e)

View File

@ -1,5 +1,5 @@
ConfigObj is a simple but powerful config file reader and writer: an ini file
round tripper. Its main feature is that it is very easy to use, with a
straightforward programmer's interface and a simple syntax for config file
ConfigObj is a simple but powerful config file reader and writer: an ini
file round tripper. Its main feature is that it is very easy to use, with a
straightforward programmer's interface and a simple syntax for config file.
WWW: http://www.voidspace.org.uk/python/configobj.html
WWW: http://www.voidspace.org.uk/python/configobj.html