rpms/python-cheetah/devel python-cheetah-import.patch, NONE, 1.1 python-cheetah.spec, 1.16, 1.17 cheetah-testing.patch, 1.1, NONE

[Toshio くらとみ]

Author: toshio

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

Modified Files:
	python-cheetah.spec 
Added Files:
	python-cheetah-import.patch 
Removed Files:
	cheetah-testing.patch 
Log Message:

* Mon Dec 1 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 2.0.1-4
- Fix cheetah enough that it will pass its unittests on python-2.6.  This has
  actually been broken since py-2.5 and this fix is only a workaround.


python-cheetah-import.patch:

--- NEW FILE python-cheetah-import.patch ---
Index: Cheetah-2.0.1/src/ImportManager.py
===================================================================
--- Cheetah-2.0.1.orig/src/ImportManager.py
+++ Cheetah-2.0.1/src/ImportManager.py
@@ -407,7 +407,13 @@ class ImportManager:
         __builtin__.__import__ = self.importHook
         __builtin__.reload = self.reloadHook
         
-    def importHook(self, name, globals=None, locals=None, fromlist=None):
+    def importHook(self, name, globals=None, locals=None, fromlist=None, level=None):
+        ### FIXME: We need to do something with the level argument instead of
+        # accepting it and not changing behaviour.
+        # Level decides whether to do relative, absolute, or both styles of
+        # import.  See this for an explanation of values:
+        # http://www.python.org/doc/2.5.2/lib/built-in-funcs.html
+
         # first see if we could be importing a relative name
         #print "importHook(%s, %s, locals, %s)" % (name, globals['__name__'], fromlist)
         _sys_modules_get = sys.modules.get


Index: python-cheetah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/devel/python-cheetah.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-cheetah.spec	2 Dec 2008 00:16:50 -0000	1.16
+++ python-cheetah.spec	2 Dec 2008 06:12:24 -0000	1.17
@@ -9,7 +9,7 @@
 License:        MIT
 URL:            http://cheetahtemplate.org/
 Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}.tar.gz
-Patch0: cheetah-testing.patch
+Patch0: python-cheetah-import.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -34,13 +34,12 @@
 %install
 rm -rf %{buildroot}
 export CHEETAH_USE_SETUPTOOLS=1
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 %check
 export PATH="%{buildroot}/%{_bindir}:$PATH"
 export PYTHONPATH="%{buildroot}/%{python_sitearch}"
 %{__python} %{buildroot}/%{python_sitearch}/Cheetah/Tests/Test.py
-cat /tmp/cheetah.log
 
 %clean
 rm -rf %{buildroot}
@@ -96,7 +95,9 @@
 
 %changelog
 * Mon Dec 1 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 2.0.1-4
-*
+- Fix cheetah enough that it will pass its unittests on python-2.6.  This has
+  actually been broken since py-2.5 and this fix is only a workaround.
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.0.1-3
 - Rebuild for Python 2.6
 


--- cheetah-testing.patch DELETED ---