Date: Sun, 9 Nov 2014 09:07:05 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372347 - in head/devel/py-configobj: . files Message-ID: <201411090907.sA9975aE051602@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Nov 9 09:07:04 2014 New Revision: 372347 URL: https://svnweb.freebsd.org/changeset/ports/372347 QAT: https://qat.redports.org/buildarchive/r372347/ Log: devel/py-configobj: Fix building on Python 3 PR: 194125 Submitted by: Matteo Cypriani Approved by: maintainer timeout Added: head/devel/py-configobj/files/ head/devel/py-configobj/files/patch-configobj.py (contents, props changed) head/devel/py-configobj/files/patch-validate.py (contents, props changed) Modified: head/devel/py-configobj/Makefile head/devel/py-configobj/pkg-descr Modified: head/devel/py-configobj/Makefile ============================================================================== --- head/devel/py-configobj/Makefile Sun Nov 9 08:53:25 2014 (r372346) +++ head/devel/py-configobj/Makefile Sun Nov 9 09:07:04 2014 (r372347) @@ -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 Added: head/devel/py-configobj/files/patch-configobj.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-configobj/files/patch-configobj.py Sun Nov 9 09:07:04 2014 (r372347) @@ -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: Added: head/devel/py-configobj/files/patch-validate.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-configobj/files/patch-validate.py Sun Nov 9 09:07:04 2014 (r372347) @@ -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) + + Modified: head/devel/py-configobj/pkg-descr ============================================================================== --- head/devel/py-configobj/pkg-descr Sun Nov 9 08:53:25 2014 (r372346) +++ head/devel/py-configobj/pkg-descr Sun Nov 9 09:07:04 2014 (r372347) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411090907.sA9975aE051602>