diff options
author | Greg Noel <GregNoel@tigris.org> | 2010-04-24 05:51:13 (GMT) |
---|---|---|
committer | Greg Noel <GregNoel@tigris.org> | 2010-04-24 05:51:13 (GMT) |
commit | 7e116b31182749950856c622ca7932031f8be19c (patch) | |
tree | a4b9f900e52561a91e0c4509dc6c692492996b7f /doc/user | |
parent | 591b78f0f314f11192fdf13d3baa66f81b160e44 (diff) | |
download | SCons-7e116b31182749950856c622ca7932031f8be19c.zip SCons-7e116b31182749950856c622ca7932031f8be19c.tar.gz SCons-7e116b31182749950856c622ca7932031f8be19c.tar.bz2 |
http://scons.tigris.org/issues/show_bug.cgi?id=2345
Comb out all code that supported earlier versions of Python. Most such
code is in snippets of only a few lines and can be identified by having
a Python version string in it. Such snippets add up; this combing pass
probably got rid of over 500 lines of code.
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/build-install.in | 17 | ||||
-rw-r--r-- | doc/user/build-install.xml | 17 | ||||
-rw-r--r-- | doc/user/builders-built-in.in | 13 | ||||
-rw-r--r-- | doc/user/builders-built-in.xml | 13 | ||||
-rw-r--r-- | doc/user/misc.in | 4 | ||||
-rw-r--r-- | doc/user/misc.xml | 4 | ||||
-rw-r--r-- | doc/user/tasks.in | 29 | ||||
-rw-r--r-- | doc/user/tasks.xml | 29 |
8 files changed, 10 insertions, 116 deletions
diff --git a/doc/user/build-install.in b/doc/user/build-install.in index d6e4394..0d5d3c7 100644 --- a/doc/user/build-install.in +++ b/doc/user/build-install.in @@ -111,17 +111,6 @@ <para> - (Note that the <option>-V</option> option - was added to Python version 2.0, - so if your system only has an earlier version available - you may see an - <literal>"Unknown option: -V"</literal> - error message.) - - </para> - - <para> - The standard location for information about downloading and installing Python is <ulink url="http://www.python.org/download/">http://www.python.org/download/</ulink>. @@ -132,10 +121,10 @@ <para> - &SCons; will work with any version of Python from 1.5.2 or later. + &SCons; will work with any version of Python from 2.4 or later. If you need to install Python and have a choice, - we recommend using the most recent Python 2.5 version available. - Python 2.5 has significant improvements + we recommend using the most recent Python version available. + Newer Pythons have significant improvements that help speed up the performance of &SCons;. </para> diff --git a/doc/user/build-install.xml b/doc/user/build-install.xml index d6e4394..0d5d3c7 100644 --- a/doc/user/build-install.xml +++ b/doc/user/build-install.xml @@ -111,17 +111,6 @@ <para> - (Note that the <option>-V</option> option - was added to Python version 2.0, - so if your system only has an earlier version available - you may see an - <literal>"Unknown option: -V"</literal> - error message.) - - </para> - - <para> - The standard location for information about downloading and installing Python is <ulink url="http://www.python.org/download/">http://www.python.org/download/</ulink>. @@ -132,10 +121,10 @@ <para> - &SCons; will work with any version of Python from 1.5.2 or later. + &SCons; will work with any version of Python from 2.4 or later. If you need to install Python and have a choice, - we recommend using the most recent Python 2.5 version available. - Python 2.5 has significant improvements + we recommend using the most recent Python version available. + Newer Pythons have significant improvements that help speed up the performance of &SCons;. </para> diff --git a/doc/user/builders-built-in.in b/doc/user/builders-built-in.in index c7516a6..3b5b981 100644 --- a/doc/user/builders-built-in.in +++ b/doc/user/builders-built-in.in @@ -838,19 +838,6 @@ <scons_output_command>scons -Q .</scons_output_command> </scons_output> - <para> - - If you're using Python version 1.5.2 to run &SCons;, - then &SCons; will try to use an external - &zip; program as follows: - - </para> - - <screen> - % <userinput>scons -Q .</userinput> - zip /home/my/project/zip.out file1 file2 - </screen> - </section> </section> diff --git a/doc/user/builders-built-in.xml b/doc/user/builders-built-in.xml index 738683b..b5f3808 100644 --- a/doc/user/builders-built-in.xml +++ b/doc/user/builders-built-in.xml @@ -812,19 +812,6 @@ zip(["out.zip"], ["file1", "file2"]) </screen> - <para> - - If you're using Python version 1.5.2 to run &SCons;, - then &SCons; will try to use an external - &zip; program as follows: - - </para> - - <screen> - % <userinput>scons -Q .</userinput> - zip /home/my/project/zip.out file1 file2 - </screen> - </section> </section> diff --git a/doc/user/misc.in b/doc/user/misc.in index b087606..437d4fe 100644 --- a/doc/user/misc.in +++ b/doc/user/misc.in @@ -36,10 +36,10 @@ <para> Although the &SCons; code itself will run - on any Python version 1.5.2 or later, + on any Python version 2.4 or later, you are perfectly free to make use of Python syntax and modules from more modern versions - (for example, Python 2.4 or 2.5) + (for example, Python 2.5 or 2.6) when writing your &SConscript; files or your own local modules. If you do this, it's usually helpful to diff --git a/doc/user/misc.xml b/doc/user/misc.xml index 7d2bf23..3cd3de7 100644 --- a/doc/user/misc.xml +++ b/doc/user/misc.xml @@ -36,10 +36,10 @@ <para> Although the &SCons; code itself will run - on any Python version 1.5.2 or later, + on any Python version 2.4 or later, you are perfectly free to make use of Python syntax and modules from more modern versions - (for example, Python 2.4 or 2.5) + (for example, Python 2.5 or 2.6) when writing your &SConscript; files or your own local modules. If you do this, it's usually helpful to diff --git a/doc/user/tasks.in b/doc/user/tasks.in index 434871f..bf6b5ee 100644 --- a/doc/user/tasks.in +++ b/doc/user/tasks.in @@ -54,16 +54,6 @@ import os.path filenames = [os.path.join(prefix, x) for x in filenames] </programlisting> -<simpara>or in Python 1.5.2:</simpara> - -<programlisting> -import os.path -new_filenames = [] -for x in filenames: - new_filenames.append(os.path.join(prefix, x)) -</programlisting> -</example> - <example> <title>Substituting a path prefix with another one</title> <programlisting> @@ -71,14 +61,6 @@ if filename.find(old_prefix) == 0: filename = filename.replace(old_prefix, new_prefix) </programlisting> -<simpara>or in Python 1.5.2:</simpara> - -<programlisting> -if filename.find(old_prefix) == 0: - filename = filename.replace(old_prefix, new_prefix) -</programlisting> -</example> - <example> <title>Filtering a filename list to exclude/retain only a specific set of extensions</title> @@ -87,17 +69,6 @@ import os.path filenames = [x for x in filenames if os.path.splitext(x)[1] in extensions] </programlisting> -<simpara>or in Python 1.5.2:</simpara> - -<programlisting> -import os.path -new_filenames = [] -for x in filenames: - if os.path.splitext(x)[1] in extensions: - new_filenames.append(x) -</programlisting> -</example> - <example> <title>The "backtick function": run a shell command and capture the output</title> diff --git a/doc/user/tasks.xml b/doc/user/tasks.xml index 434871f..bf6b5ee 100644 --- a/doc/user/tasks.xml +++ b/doc/user/tasks.xml @@ -54,16 +54,6 @@ import os.path filenames = [os.path.join(prefix, x) for x in filenames] </programlisting> -<simpara>or in Python 1.5.2:</simpara> - -<programlisting> -import os.path -new_filenames = [] -for x in filenames: - new_filenames.append(os.path.join(prefix, x)) -</programlisting> -</example> - <example> <title>Substituting a path prefix with another one</title> <programlisting> @@ -71,14 +61,6 @@ if filename.find(old_prefix) == 0: filename = filename.replace(old_prefix, new_prefix) </programlisting> -<simpara>or in Python 1.5.2:</simpara> - -<programlisting> -if filename.find(old_prefix) == 0: - filename = filename.replace(old_prefix, new_prefix) -</programlisting> -</example> - <example> <title>Filtering a filename list to exclude/retain only a specific set of extensions</title> @@ -87,17 +69,6 @@ import os.path filenames = [x for x in filenames if os.path.splitext(x)[1] in extensions] </programlisting> -<simpara>or in Python 1.5.2:</simpara> - -<programlisting> -import os.path -new_filenames = [] -for x in filenames: - if os.path.splitext(x)[1] in extensions: - new_filenames.append(x) -</programlisting> -</example> - <example> <title>The "backtick function": run a shell command and capture the output</title> |