mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-26 05:02:18 +00:00
- Update to 5.0.6 [1]
- Use CHEESESHOP as download site - Remove patches under files/ - Update WWW address PR: 194630 [1] Submitted by: Olivier Cochard <olivier@cochard.me> [1]
This commit is contained in:
parent
64f80edf64
commit
f6365eb6a7
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=377790
@ -2,12 +2,10 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= configobj
|
||||
PORTVERSION= 4.7.2
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 5.0.6
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= devel python
|
||||
MASTER_SITES= http://www.voidspace.org.uk/downloads/ \
|
||||
SF \
|
||||
${MASTER_SITE_GOOGLE_CODE}
|
||||
MASTER_SITES= CHEESESHOP
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
||||
MAINTAINER= nivit@FreeBSD.org
|
||||
@ -15,7 +13,7 @@ COMMENT= Simple but powerful config file reader and writer
|
||||
|
||||
LICENSE= BSD3CLAUSE
|
||||
|
||||
USES= python zip
|
||||
USES= python
|
||||
USE_PYTHON= distutils autoplist
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (configobj-4.7.2.zip) = 332a0d20d4d736d521d95cb2cf069b1ac7c858985207db4296f4050396558c49
|
||||
SIZE (configobj-4.7.2.zip) = 143618
|
||||
SHA256 (configobj-5.0.6.tar.gz) = a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902
|
||||
SIZE (configobj-5.0.6.tar.gz) = 33248
|
||||
|
@ -1,43 +0,0 @@
|
||||
--- 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:
|
@ -1,38 +0,0 @@
|
||||
--- 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)
|
||||
|
||||
|
@ -2,4 +2,4 @@ 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: https://github.com/DiffSK/configobj/
|
||||
|
Loading…
Reference in New Issue
Block a user