rpms/python-myghty/devel myghty-importer.patch, NONE, 1.1 python-myghty.spec, 1.15, 1.16

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/python-myghty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31327

Modified Files:
	python-myghty.spec 
Added Files:
	myghty-importer.patch 
Log Message:

* Mon Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-9
- Fix for building with python2.6


myghty-importer.patch:

--- NEW FILE myghty-importer.patch ---
diff -up Myghty-1.1/lib/myghty/importer.py.bak Myghty-1.1/lib/myghty/importer.py
--- Myghty-1.1/lib/myghty/importer.py.bak	2009-04-13 19:19:56.000000000 -0700
+++ Myghty-1.1/lib/myghty/importer.py	2009-04-13 19:23:42.000000000 -0700
@@ -47,11 +47,13 @@ modules = weakref.WeakValueDictionary()
 
 # 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):
+    # For now, level is ignored
     try:
         return modules[name].module
     except KeyError:
-        return builtin_importer(name, globals, locals, fromlist)
+        return builtin_importer(name, globals, locals, fromlist, level)
 
 __builtin__.__import__ = import_module
 


Index: python-myghty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-myghty.spec	26 Feb 2009 22:29:29 -0000	1.15
+++ python-myghty.spec	14 Apr 2009 02:52:29 -0000	1.16
@@ -2,13 +2,14 @@
 
 Name:           python-myghty
 Version:        1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.myghty.org
 Source0:        http://download.sourceforge.net/sourceforge/myghty/Myghty-%{version}.tar.gz
+Patch0: myghty-importer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -31,7 +32,7 @@
 
 %prep
 %setup -q -n Myghty-%{version}
-
+%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -54,6 +55,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-9
+- Fix for building with python2.6
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild