[Python-modules-commits] r12158 - in packages/myghty/trunk/debian (5 files)

[jwilk at users.alioth.debian.org]

    Date: Friday, March 5, 2010 @ 19:16:33
  Author: jwilk
Revision: 12158

* Fix FTBFS with Python 2.6 (closes: #571498):
  - apply patch adding support for 5th argument of __import__();
  - bump XS-Python-Version to >= 2.5.

Added:
  packages/myghty/trunk/debian/patches/
  packages/myghty/trunk/debian/patches/import-5th-arg.diff
  packages/myghty/trunk/debian/patches/series
Modified:
  packages/myghty/trunk/debian/changelog
  packages/myghty/trunk/debian/control

Modified: packages/myghty/trunk/debian/changelog
===================================================================
--- packages/myghty/trunk/debian/changelog	2010-03-05 19:03:33 UTC (rev 12157)
+++ packages/myghty/trunk/debian/changelog	2010-03-05 19:16:33 UTC (rev 12158)
@@ -3,6 +3,9 @@
   [ Jakub Wilk ]
   * Switch to source format 3.0 (quilt)
   * Remove *.pyc, *.pyo and *.egg-info in the clean target.
+  * Fix FTBFS with Python 2.6 (closes: #571498):
+    - apply patch adding support for 5th argument of __import__();
+    - bump XS-Python-Version to >= 2.5.
 
  -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Fri, 05 Mar 2010 19:53:59 +0100
 

Modified: packages/myghty/trunk/debian/control
===================================================================
--- packages/myghty/trunk/debian/control	2010-03-05 19:03:33 UTC (rev 12157)
+++ packages/myghty/trunk/debian/control	2010-03-05 19:16:33 UTC (rev 12158)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: python-all, python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1~)
 Standards-Version: 3.8.4
-XS-Python-Version: all
+XS-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/myghty/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/myghty/trunk/
 Homepage: http://www.myghty.org/

Added: packages/myghty/trunk/debian/patches/import-5th-arg.diff
===================================================================
--- packages/myghty/trunk/debian/patches/import-5th-arg.diff	                        (rev 0)
+++ packages/myghty/trunk/debian/patches/import-5th-arg.diff	2010-03-05 19:16:33 UTC (rev 12158)
@@ -0,0 +1,22 @@
+Description: Add support for 5th argument of __import__().
+Author: Jakub Wilk <jwilk at debian.org>
+Bug-Debian: http://bugs.debian.org/571498
+
+Index: myghty-1.1/lib/myghty/importer.py
+===================================================================
+--- myghty-1.1.orig/lib/myghty/importer.py	2006-09-10 21:32:32.000000000 +0200
++++ myghty-1.1/lib/myghty/importer.py	2010-03-05 20:15:40.000000000 +0100
+@@ -47,11 +47,11 @@
+ 
+ # override __import__ to look in our own local module dict first
+ builtin_importer = __builtin__.__import__
+-def import_module(name, globals = None, locals = None, fromlist = None):
++def import_module(name, globals = None, locals = None, fromlist = None, level = -1):
+     try:
+         return modules[name].module
+     except KeyError:
+-        return builtin_importer(name, globals, locals, fromlist)
++        return builtin_importer(name, globals, locals, fromlist, level = -1)
+ 
+ __builtin__.__import__ = import_module
+ 

Added: packages/myghty/trunk/debian/patches/series
===================================================================
--- packages/myghty/trunk/debian/patches/series	                        (rev 0)
+++ packages/myghty/trunk/debian/patches/series	2010-03-05 19:16:33 UTC (rev 12158)
@@ -0,0 +1 @@
+import-5th-arg.diff