| 1 |
arfrever 09/10/01 02:53:06 |
| 2 |
|
| 3 |
Added: myghty-1.1-python-2.6.patch |
| 4 |
Log: |
| 5 |
Support Python 2.6 (bug #282184). Set SUPPORT_PYTHON_ABIS. |
| 6 |
(Portage version: 14469-svn/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-python/myghty/files/myghty-1.1-python-2.6.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/myghty/files/myghty-1.1-python-2.6.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/myghty/files/myghty-1.1-python-2.6.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: myghty-1.1-python-2.6.patch |
| 15 |
=================================================================== |
| 16 |
Index: lib/myghty/importer.py |
| 17 |
=================================================================== |
| 18 |
--- lib/myghty/importer.py (revision 2153) |
| 19 |
+++ lib/myghty/importer.py (revision 2155) |
| 20 |
@@ -47,11 +47,20 @@ |
| 21 |
|
| 22 |
# override __import__ to look in our own local module dict first |
| 23 |
builtin_importer = __builtin__.__import__ |
| 24 |
-def import_module(name, globals = None, locals = None, fromlist = None): |
| 25 |
- try: |
| 26 |
- return modules[name].module |
| 27 |
- except KeyError: |
| 28 |
- return builtin_importer(name, globals, locals, fromlist) |
| 29 |
+if sys.version_info >= (2, 5): |
| 30 |
+ def import_module(name, globals = None, locals = None, fromlist = None, level = -1): |
| 31 |
+ if level == -1: |
| 32 |
+ try: |
| 33 |
+ return modules[name].module |
| 34 |
+ except KeyError: |
| 35 |
+ pass |
| 36 |
+ return builtin_importer(name, globals, locals, fromlist, level) |
| 37 |
+else: |
| 38 |
+ def import_module(name, globals = None, locals = None, fromlist = None): |
| 39 |
+ try: |
| 40 |
+ return modules[name].module |
| 41 |
+ except KeyError: |
| 42 |
+ return builtin_importer(name, globals, locals, fromlist) |
| 43 |
|
| 44 |
__builtin__.__import__ = import_module |
Archives