diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | cheetah/Tests/CheetahWrapper.py | 15 | ||||
| -rw-r--r-- | cheetah/Version.py | 4 |
3 files changed, 18 insertions, 4 deletions
@@ -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 <debogdano@gmail.com>) - Removal of the contrib/markdown module (in favor of a setuptools dependency) 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() 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) |