diff options
| author | noah <noah@656d521f-e311-0410-88e0-e7920216d269> | 2009-02-01 14:05:34 +0000 |
|---|---|---|
| committer | noah <noah@656d521f-e311-0410-88e0-e7920216d269> | 2009-02-01 14:05:34 +0000 |
| commit | de2c4c0e45f0ea8c9a20fddf4c7b52c27bb7f3f5 (patch) | |
| tree | 929f8bcb9eac77399c93c21a275f1c5ac088dd09 | |
| parent | 0b54fce17d896eefc7329954f32522549028b709 (diff) | |
| download | pexpect-de2c4c0e45f0ea8c9a20fddf4c7b52c27bb7f3f5.tar.gz | |
Minor changes.
git-svn-id: http://pexpect.svn.sourceforge.net/svnroot/pexpect/trunk@520 656d521f-e311-0410-88e0-e7920216d269
| -rw-r--r-- | pexpect/Makefile | 4 | ||||
| -rw-r--r-- | pexpect/pexpect.py | 4 | ||||
| -rwxr-xr-x | pexpect/tools/merge_templates.py | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pexpect/Makefile b/pexpect/Makefile index 2c730ef..b1a0b3e 100644 --- a/pexpect/Makefile +++ b/pexpect/Makefile @@ -1,13 +1,13 @@ -# TODO This stupid Makefile is getty crappier and crappier. Is 'crappier' a word? SHELL = /bin/sh -VERSION=2.4 +VERSION=2.5 #DOCGENERATOR= happydoc DOCGENERATOR=pydoc -w # This is for GNU Make. This does not work on BSD Make. #MANIFEST_LINES := $(shell cat MANIFEST) # This is for BSD Make. This does not work on GNU Make. #MANIFEST_LINES != cat MANIFEST +# I hate Makefiles. all: merge_templates docs dist diff --git a/pexpect/pexpect.py b/pexpect/pexpect.py index a1e009f..d783539 100644 --- a/pexpect/pexpect.py +++ b/pexpect/pexpect.py @@ -85,7 +85,7 @@ except ImportError, e: A critical module was not found. Probably this operating system does not support it. Pexpect is intended for UNIX-like operating systems.""") -__version__ = '2.4' +__version__ = '2.5' __revision__ = '$Revision$' __all__ = ['ExceptionPexpect', 'EOF', 'TIMEOUT', 'spawn', 'run', 'which', 'split_command_line', '__version__', '__revision__'] @@ -1847,4 +1847,4 @@ def split_command_line(command_line): arg_list.append(arg) return arg_list -# vi:ts=4:sw=4:expandtab:ft=python: +# vi:set sr et ts=4 sw=4 ft=python : diff --git a/pexpect/tools/merge_templates.py b/pexpect/tools/merge_templates.py index 0bc03a0..6128b68 100755 --- a/pexpect/tools/merge_templates.py +++ b/pexpect/tools/merge_templates.py @@ -26,13 +26,13 @@ d = pyed.pyed() d.read ("doc/index.template.html") for cl in d.match_lines('.*VERSION.*'): d.cur_line = d.cur_line.replace('VERSION', version) -d.write("doc/index.html") - +d.write("doc/index.html") + # Edit the setup.py to update current VERSION. d = pyed.pyed() d.read ("setup.py.template") for cl in d.match_lines('.*VERSION.*'): d.cur_line = d.cur_line.replace('VERSION', version) -d.write("setup.py") +d.write("setup.py") os.chmod("setup.py", 0755) |