Hi Barry,
I'm not maintainer of this package, but...
* Barry Warsaw <[email protected]>, 2010-11-29, 15:05:
Package: cheetah
Version: 2.4.3
There is no such version in Debian:
$ rmadison cheetah
cheetah | 2.0~rc7-1 | etch | source
cheetah | 2.0.1-2 | lenny | source
cheetah | 2.4.2.1-1 | squeeze | source
cheetah | 2.4.2.1-1 | sid | source
02_clean_modules.patch and 03_python-2.6-warning-fix.patch are no
longer necessary.
The latest version of cheetah in Debian doesn't carry any of these
patches AFAICS.
diff -uNr Cheetah-2.4.2.1.orig/cheetah/Template.py
Cheetah-2.4.2.1/cheetah/Template.py
--- Cheetah-2.4.2.1.orig/cheetah/Template.py 2010-02-07 23:17:23.000000000
-0500
+++ Cheetah-2.4.2.1/cheetah/Template.py 2010-10-18 14:06:54.439935114 -0400
@@ -32,7 +32,7 @@
filetype = None
-if isinstance(sys.version_info, tuple):
+if isinstance(sys.version_info[:], tuple):
# Python 2.xx
filetype = types.FileType
def createMethod(func, cls):
This hunk looks good, as sys.version_info is not a tuple in Python 2.7.
(Don't ask me why...)
diff -uNr Cheetah-2.4.2.1.orig/cheetah/Tests/SyntaxAndOutput.py
Cheetah-2.4.2.1/cheetah/Tests/SyntaxAndOutput.py
--- Cheetah-2.4.2.1.orig/cheetah/Tests/SyntaxAndOutput.py 2010-10-18
15:00:44.668935001 -0400
+++ Cheetah-2.4.2.1/cheetah/Tests/SyntaxAndOutput.py 2010-10-18
14:43:56.500934997 -0400
@@ -847,17 +847,17 @@
def test10(self):
r"""func placeholder - with ('''\nstring\n''')"""
self.verify("$aFunc('''\naoeu\n''')",
- "\naoeu\n")
+ "\naoeu\n", convertEOLs=False)
def test11(self):
r"""func placeholder - with ('''\nstring'\n''')"""
self.verify("$aFunc('''\naoeu'\n''')",
- "\naoeu'\n")
+ "\naoeu'\n", convertEOLs=False)
def test12(self):
r'''func placeholder - with ("""\nstring\n""")'''
self.verify('$aFunc("""\naoeu\n""")',
- "\naoeu\n")
+ "\naoeu\n", convertEOLs=False)
def test13(self):
"""func placeholder - with (string*int)"""
This one looks wrong. I believe that the tests were correct and the bug
is somewhere else.
--
Jakub Wilk
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
