Please merge cheetah 2.4.2.1-1 (main) from Debian unstable (main)
Bug #663343 reported by
Clint Byrum
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
cheetah (Ubuntu) |
Fix Released
|
Undecided
|
Unassigned |
Bug Description
Merge for latest cheetah in Debian.
Related branches
lp:~barry/ubuntu/natty/cheetah/py27-compat
- Clint Byrum: Pending requested
- Ubuntu branches: Pending requested
-
Diff: 43600 lines (+19910/-22763)152 files modifiedCHANGES (+91/-3)
Cheetah.egg-info/PKG-INFO (+47/-0)
Cheetah.egg-info/SOURCES.txt (+80/-0)
Cheetah.egg-info/dependency_links.txt (+1/-0)
Cheetah.egg-info/requires.txt (+1/-0)
Cheetah.egg-info/top_level.txt (+1/-0)
MANIFEST.in (+3/-3)
PKG-INFO (+7/-864)
README (+0/-51)
README.markdown (+51/-0)
SetupConfig.py (+44/-61)
SetupTools.py (+60/-29)
TODO (+6/-14)
bin/cheetah (+2/-2)
bin/cheetah-analyze (+6/-0)
bin/cheetah-compile (+2/-4)
cachedCompile.py (+0/-11)
cheetah-mem.py (+0/-22)
cheetah/CacheRegion.py (+136/-0)
cheetah/CacheStore.py (+106/-0)
cheetah/CheetahWrapper.py (+632/-0)
cheetah/Compiler.py (+2002/-0)
cheetah/DirectiveAnalyzer.py (+98/-0)
cheetah/Django.py (+16/-0)
cheetah/DummyTransaction.py (+108/-0)
cheetah/ErrorCatchers.py (+62/-0)
cheetah/FileUtils.py (+357/-0)
cheetah/Filters.py (+212/-0)
cheetah/ImportHooks.py (+129/-0)
cheetah/ImportManager.py (+541/-0)
cheetah/Macros/I18n.py (+67/-0)
cheetah/Macros/__init__.py (+1/-0)
cheetah/NameMapper.py (+366/-0)
cheetah/Parser.py (+2661/-0)
cheetah/Servlet.py (+48/-0)
cheetah/SettingsManager.py (+284/-0)
cheetah/SourceReader.py (+267/-0)
cheetah/Template.py (+1941/-0)
cheetah/TemplateCmdLineIface.py (+107/-0)
cheetah/Templates/SkeletonPage.py (+272/-0)
cheetah/Templates/SkeletonPage.tmpl (+44/-0)
cheetah/Templates/_SkeletonPage.py (+215/-0)
cheetah/Templates/__init__.py (+1/-0)
cheetah/Tests/Analyzer.py (+29/-0)
cheetah/Tests/CheetahWrapper.py (+579/-0)
cheetah/Tests/Cheps.py (+39/-0)
cheetah/Tests/Filters.py (+70/-0)
cheetah/Tests/Misc.py (+20/-0)
cheetah/Tests/NameMapper.py (+548/-0)
cheetah/Tests/Parser.py (+49/-0)
cheetah/Tests/Performance.py (+243/-0)
cheetah/Tests/Regressions.py (+247/-0)
cheetah/Tests/SyntaxAndOutput.py (+3253/-0)
cheetah/Tests/Template.py (+363/-0)
cheetah/Tests/Test.py (+53/-0)
cheetah/Tests/Unicode.py (+237/-0)
cheetah/Tests/__init__.py (+1/-0)
cheetah/Tests/xmlrunner.py (+381/-0)
cheetah/Tools/CGITemplate.py (+77/-0)
cheetah/Tools/MondoReport.py (+464/-0)
cheetah/Tools/MondoReportDoc.txt (+391/-0)
cheetah/Tools/RecursiveNull.py (+28/-0)
cheetah/Tools/SiteHierarchy.py (+166/-0)
cheetah/Tools/__init__.py (+8/-0)
cheetah/Tools/turbocheetah/__init__.py (+5/-0)
cheetah/Tools/turbocheetah/cheetahsupport.py (+110/-0)
cheetah/Tools/turbocheetah/tests/__init__.py (+1/-0)
cheetah/Tools/turbocheetah/tests/test_template.py (+66/-0)
cheetah/Unspecified.py (+9/-0)
cheetah/Utils/Indenter.py (+123/-0)
cheetah/Utils/Misc.py (+67/-0)
cheetah/Utils/WebInputMixin.py (+102/-0)
cheetah/Utils/__init__.py (+1/-0)
cheetah/Utils/htmlDecode.py (+14/-0)
cheetah/Utils/htmlEncode.py (+21/-0)
cheetah/Utils/statprof.py (+304/-0)
cheetah/Version.py (+58/-0)
cheetah/__init__.py (+20/-0)
cheetah/c/Cheetah.h (+47/-0)
cheetah/c/_namemapper.c (+494/-0)
cheetah/c/cheetah.h (+78/-0)
cheetah/convertTmplPathToModuleName.py (+20/-0)
closure.py (+0/-199)
debian/changelog (+7/-0)
debian/patches/02_clean_modules.patch (+0/-280)
debian/patches/02_fedora_cheetah_2.7_compat.patch (+36/-0)
debian/patches/03_ptyhon-2.6-warning-fix.patch (+0/-25)
debian/rules (+1/-1)
ez_setup.py (+0/-164)
foo.py (+0/-151)
setup.cfg (+5/-0)
src/CacheRegion.py (+0/-138)
src/CacheStore.py (+0/-108)
src/CheetahWrapper.py (+0/-589)
src/Compiler.py (+0/-2009)
src/DummyTransaction.py (+0/-58)
src/ErrorCatchers.py (+0/-63)
src/FileUtils.py (+0/-374)
src/Filters.py (+0/-176)
src/ImportHooks.py (+0/-139)
src/ImportManager.py (+0/-561)
src/Macros/I18n.py (+0/-67)
src/Macros/__init__.py (+0/-1)
src/NameMapper.py (+0/-355)
src/Parser.py (+0/-2599)
src/Servlet.py (+0/-126)
src/SettingsManager.py (+0/-620)
src/SourceReader.py (+0/-304)
src/Template.py (+0/-1856)
src/TemplateCmdLineIface.py (+0/-108)
src/Templates/SkeletonPage.py (+0/-273)
src/Templates/SkeletonPage.tmpl (+0/-44)
src/Templates/_SkeletonPage.py (+0/-216)
src/Templates/__init__.py (+0/-1)
src/Tests/CheetahWrapper.py (+0/-596)
src/Tests/FileRefresh.py (+0/-55)
src/Tests/NameMapper.py (+0/-539)
src/Tests/SyntaxAndOutput.py (+0/-3230)
src/Tests/Template.py (+0/-312)
src/Tests/Test.py (+0/-70)
src/Tests/__init__.py (+0/-1)
src/Tests/unittest_local_copy.py (+0/-977)
src/Tools/CGITemplate.py (+0/-78)
src/Tools/MondoReport.py (+0/-464)
src/Tools/MondoReportDoc.txt (+0/-391)
src/Tools/RecursiveNull.py (+0/-23)
src/Tools/SiteHierarchy.py (+0/-183)
src/Tools/__init__.py (+0/-8)
src/Tools/turbocheetah/__init__.py (+0/-5)
src/Tools/turbocheetah/cheetahsupport.py (+0/-110)
src/Tools/turbocheetah/tests/__init__.py (+0/-1)
src/Tools/turbocheetah/tests/test_template.py (+0/-66)
src/Unspecified.py (+0/-9)
src/Utils/Indenter.py (+0/-135)
src/Utils/Misc.py (+0/-82)
src/Utils/VerifyType.py (+0/-82)
src/Utils/WebInputMixin.py (+0/-103)
src/Utils/__init__.py (+0/-1)
src/Utils/htmlDecode.py (+0/-14)
src/Utils/htmlEncode.py (+0/-21)
src/Utils/memcache.py (+0/-625)
src/Utils/optik/__init__.py (+0/-32)
src/Utils/optik/errors.py (+0/-52)
src/Utils/optik/option.py (+0/-354)
src/Utils/optik/option_parser.py (+0/-667)
src/Version.py (+0/-58)
src/__init__.py (+0/-27)
src/_namemapper.c (+0/-490)
src/convertTmplPathToModuleName.py (+0/-15)
syntaxtest.py (+0/-15)
test2.2.py (+0/-2)
timingTests.py (+0/-201)
lp:~clint-fewbar/ubuntu/natty/cheetah/natty-merge-with-debian
- Mathias Gug: Needs Fixing
- Barry Warsaw (community): Approve
- Ubuntu branches: Pending requested
-
Diff: 217390 lines (+130/-217180)7 files modifieddebian/changelog (+59/-0)
debian/control (+13/-11)
debian/patches/fix_ftbfs_c_extension_python25.patch (+48/-0)
debian/patches/series (+2/-0)
debian/rules (+7/-8)
debian/source/format (+1/-0)
test.strace (+0/-217161)
Changed in cheetah (Ubuntu): | |
status: | New → In Progress |
assignee: | nobody → Clint Byrum (clint-fewbar) |
Changed in cheetah (Ubuntu): | |
status: | In Progress → Confirmed |
tags: | added: patch |
Changed in cheetah (Ubuntu): | |
status: | Fix Released → Confirmed |
assignee: | Clint Byrum (clint-fewbar) → nobody |
To post a comment you must log in.
Hmm, after uploading those patches I see that cheetah fails quite badly on Python 2.7.