[97836] trunk/dports/python/py-billiard

stromnov at macports.org stromnov at macports.org
Mon Sep 17 04:08:36 PDT 2012


Revision: 97836
          http://trac.macports.org//changeset/97836
Author:   stromnov at macports.org
Date:     2012-09-17 04:08:36 -0700 (Mon, 17 Sep 2012)
Log Message:
-----------
py-billiard: fix for #36167

Modified Paths:
--------------
    trunk/dports/python/py-billiard/Portfile

Added Paths:
-----------
    trunk/dports/python/py-billiard/files/
    trunk/dports/python/py-billiard/files/patch-setup.py.diff

Modified: trunk/dports/python/py-billiard/Portfile
===================================================================
--- trunk/dports/python/py-billiard/Portfile	2012-09-17 10:07:28 UTC (rev 97835)
+++ trunk/dports/python/py-billiard/Portfile	2012-09-17 11:08:36 UTC (rev 97836)
@@ -27,6 +27,10 @@
 python.default_version  27
 
 if {$subport != $name} {
+    # Workaround for py3k bug introduced in version 2.7.3.13
+    if {$subport == "py31-billiard" || $subport == "py32-billiard"} {
+        patchfiles-append   patch-setup.py.diff
+    }
     depends_lib-append  port:py${python.version}-distribute
 }
 

Added: trunk/dports/python/py-billiard/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-billiard/files/patch-setup.py.diff	                        (rev 0)
+++ trunk/dports/python/py-billiard/files/patch-setup.py.diff	2012-09-17 11:08:36 UTC (rev 97836)
@@ -0,0 +1,44 @@
+--- setup.py	(original)
++++ setup.py	(refactored)
+@@ -54,13 +54,13 @@
+         try:
+             build_ext.run(self)
+         except DistutilsPlatformError:
+-            raise BuildFailed, BuildFailed(), sys.exc_info()[2]
++            raise BuildFailed(BuildFailed()).with_traceback(sys.exc_info()[2])
+ 
+     def build_extension(self, ext):
+         try:
+             build_ext.build_extension(self, ext)
+         except ext_errors:
+-            raise BuildFailed, BuildFailed(), sys.exc_info()[2]
++            raise BuildFailed(BuildFailed()).with_traceback(sys.exc_info()[2])
+ 
+ 
+ # -*- py3k -*-
+@@ -100,7 +100,7 @@
+     for line in meta_fh:
+         if line.strip() == '# -eof meta-':
+             break
+-        for pattern, handler in pats.items():
++        for pattern, handler in list(pats.items()):
+             m = pattern.match(line.strip())
+             if m:
+                 meta.update(handler(m))
+@@ -194,7 +194,7 @@
+         extensions = [
+         Extension('_billiard',
+                 sources=multiprocessing_srcs,
+-                define_macros=macros.items(),
++                define_macros=list(macros.items()),
+                 libraries=libraries,
+                 include_dirs=['Modules/_billiard'],
+                 depends=(glob.glob('Modules/_billiard/*.h') +
+@@ -232,6 +232,6 @@
+ 
+ try:
+     run_setup(not (is_jython or is_pypy or is_py3k))
+-except BuildFailed, exc:
++except BuildFailed as exc:
+     sys.stderr.write(BUILD_WARNING % (exc, ))
+     run_setup(False)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120917/4f246a6b/attachment.html>


More information about the macports-changes mailing list