From 9050b8bf0fa67e098aae6f6f9f675530ffffd364 Mon Sep 17 00:00:00 2001 From: "R. Tyler Ballance" Date: Thu, 17 Sep 2009 10:25:08 -0700 Subject: Bump the version in /next/ to 2.3.0 --- CHANGES | 3 +++ cheetah/Version.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 56c1d07..15c5f0c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,7 @@ +2.3.0 (unreleased) + - + 2.2.2 (September 10th, 2009) - Prevent _namemapper.c from segfaulting when PyImport_ImportModule fails for some reason (Bogdano Arendartchuk ) - Removal of the contrib/markdown module (in favor of a setuptools dependency) diff --git a/cheetah/Version.py b/cheetah/Version.py index 75a009c..bb49856 100644 --- a/cheetah/Version.py +++ b/cheetah/Version.py @@ -1,5 +1,5 @@ -Version = '2.2.2' -VersionTuple = (2, 2, 2,'final', 0) +Version = '2.3.0' +VersionTuple = (2, 3, 0, 'development', 0) MinCompatibleVersion = '2.0rc6' MinCompatibleVersionTuple = (2,0,0,'candidate',6) -- cgit v1.2.1 From d6cc8d39f8248182590cdb1bcf56d0e477dbd6b9 Mon Sep 17 00:00:00 2001 From: Mike Bonnet Date: Tue, 15 Sep 2009 17:55:31 -0400 Subject: implement the popen2.Popen4 interface using the subprocess.Popen backend, to avoid DeprecationWarnings when running the tests on python >= 2.6 Finally got tired of 'em. :) --- cheetah/Tests/CheetahWrapper.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/cheetah/Tests/CheetahWrapper.py b/cheetah/Tests/CheetahWrapper.py index ca7b0ae..e152e68 100644 --- a/cheetah/Tests/CheetahWrapper.py +++ b/cheetah/Tests/CheetahWrapper.py @@ -12,7 +12,6 @@ Besides unittest usage, recognizes the following command-line options: Show the output of each subcommand. (Normally suppressed.) ''' import os -import popen2 import re # Used by listTests. import shutil import sys @@ -22,6 +21,18 @@ import unittest from optparse import OptionParser from Cheetah.CheetahWrapper import CheetahWrapper # Used by NoBackup. +try: + from subprocess import Popen, PIPE, STDOUT + class Popen4(Popen): + def __init__(self, cmd, bufsize=-1): + super(Popen4, self).__init__(cmd, bufsize=bufsize, + shell=True, close_fds=True, + stdin=PIPE, stdout=PIPE, stderr=STDOUT) + self.tochild = self.stdin + self.fromchild = self.stdout + self.childerr = self.stderr +except ImportError: + from popen2 import Popen4 DELETE = True # True to clean up after ourselves, False for debugging. OUTPUT = False # Normally False, True for debugging. @@ -152,7 +163,7 @@ Found %(result)r""" return rc, output def assertPosixSubprocess(self, cmd): - process = popen2.Popen4(cmd) + process = Popen4(cmd) process.tochild.close() output = process.fromchild.read() status = process.wait() -- cgit v1.2.1 From 35cba2a8c9c41720d08d82a384150ecf40825a25 Mon Sep 17 00:00:00 2001 From: "R. Tyler Ballance" Date: Sun, 20 Sep 2009 00:46:24 -0700 Subject: Rename the README to reflect formatting --- README | 51 --------------------------------------------------- README.markdown | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 README create mode 100644 README.markdown diff --git a/README b/README deleted file mode 100644 index fe473b1..0000000 --- a/README +++ /dev/null @@ -1,51 +0,0 @@ -Cheetah is an open source template engine and code generation tool. - -It can be used standalone or combined with other tools and frameworks. Web -development is its principle use, but Cheetah is very flexible and is also being -used to generate C++ game code, Java, sql, form emails and even Python code. - -Documentation -================================================================================ -For a high-level introduction to Cheetah please refer to the User\'s Guide -at http://cheetahtemplate.org/learn.html - -Mailing list -================================================================================ -cheetahtemplate-discuss@lists.sourceforge.net -Subscribe at http://lists.sourceforge.net/lists/listinfo/cheetahtemplate-discuss - -Credits -================================================================================ -http://cheetahtemplate.org/credits.html - -Praise -================================================================================ -"I\'m enamored with Cheetah" - Sam Ruby, senior member of IBM Emerging -Technologies Group & director of Apache Software Foundation - -"Give Cheetah a try. You won\'t regret it. ... Cheetah is a truly powerful -system. ... Cheetah is a serious contender for the 'best of breed' Python -templating." - Alex Martelli - -"People with a strong PHP background absolutely love Cheetah for being Smarty, -but much, much better." - Marek Baczynski - -"I am using Smarty and I know it very well, but compiled Cheetah Templates with -its inheritance approach is much powerful and easier to use than Smarty." - -Jaroslaw Zabiello - -"There is no better solution than Cheetah" - Wilk - -"A cheetah template can inherit from a python class, or a cheetah template, and -a Python class can inherit from a cheetah template. This brings the full power -of OO programming facilities to the templating system, and simply blows away -other templating systems" - Mike Meyer - -"Cheetah has successfully been introduced as a replacement for the overweight -XSL Templates for code generation. Despite the power of XSL (and notably XPath -expressions), code generation is better suited to Cheetah as templates are much -easier to implement and manage." - The FEAR development team - (http://fear.sourceforge.net/docs/latest/guide/Build.html#id2550573) - -"I\'ve used Cheetah quite a bit and it\'s a very good package" - Kevin Dangoor, -lead developer of TurboGears. diff --git a/README.markdown b/README.markdown new file mode 100644 index 0000000..fe473b1 --- /dev/null +++ b/README.markdown @@ -0,0 +1,51 @@ +Cheetah is an open source template engine and code generation tool. + +It can be used standalone or combined with other tools and frameworks. Web +development is its principle use, but Cheetah is very flexible and is also being +used to generate C++ game code, Java, sql, form emails and even Python code. + +Documentation +================================================================================ +For a high-level introduction to Cheetah please refer to the User\'s Guide +at http://cheetahtemplate.org/learn.html + +Mailing list +================================================================================ +cheetahtemplate-discuss@lists.sourceforge.net +Subscribe at http://lists.sourceforge.net/lists/listinfo/cheetahtemplate-discuss + +Credits +================================================================================ +http://cheetahtemplate.org/credits.html + +Praise +================================================================================ +"I\'m enamored with Cheetah" - Sam Ruby, senior member of IBM Emerging +Technologies Group & director of Apache Software Foundation + +"Give Cheetah a try. You won\'t regret it. ... Cheetah is a truly powerful +system. ... Cheetah is a serious contender for the 'best of breed' Python +templating." - Alex Martelli + +"People with a strong PHP background absolutely love Cheetah for being Smarty, +but much, much better." - Marek Baczynski + +"I am using Smarty and I know it very well, but compiled Cheetah Templates with +its inheritance approach is much powerful and easier to use than Smarty." - +Jaroslaw Zabiello + +"There is no better solution than Cheetah" - Wilk + +"A cheetah template can inherit from a python class, or a cheetah template, and +a Python class can inherit from a cheetah template. This brings the full power +of OO programming facilities to the templating system, and simply blows away +other templating systems" - Mike Meyer + +"Cheetah has successfully been introduced as a replacement for the overweight +XSL Templates for code generation. Despite the power of XSL (and notably XPath +expressions), code generation is better suited to Cheetah as templates are much +easier to implement and manage." - The FEAR development team + (http://fear.sourceforge.net/docs/latest/guide/Build.html#id2550573) + +"I\'ve used Cheetah quite a bit and it\'s a very good package" - Kevin Dangoor, +lead developer of TurboGears. -- cgit v1.2.1