summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix test/option/profile.py to hide old-style import from fixers.Greg Noel2010-04-271-22/+6
|
* Python 2.6 forward compatibility with 3.x: use a subclass of io.StringIOSteven Knight2010-04-271-2/+15
| | | | to enforce that all strings passed to the .write() method are unicode.
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-268-70/+71
| | | | Apply all the remaining changes from the fixers.
* Fix regression tests (imports not happening as expected)Greg Noel2010-04-255-28/+12
|
* Add compat support for renaming '_winreg' as 'winreg' in Python 3.x.Greg Noel2010-04-253-64/+49
|
* Convert to Python 3.x division rules.Greg Noel2010-04-2415-22/+31
|
* Remove the compat version of the "platform" module.Greg Noel2010-04-242-244/+0
|
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-24115-1268/+305
| | | | | | | 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.
* http://scons.tigris.org/issues/show_bug.cgi?id=2317Greg Noel2010-04-2328-44/+44
| | | | | | Apply the refactorings from the 'dict' fixer, less occurrences that were manually audited to be safe. Also pick up changes in bin/sfsum, a Python file that was not being scanned before.
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-213-38/+15
| | | | Apply the 'itertools' and 'itertools_imports' fixers.
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-2111-59/+40
| | | | | | Pass the python executable from the -P option to runtest to TestCmd.py. Create the escaped executable name in TestCmd.py as well. Pass those two values into derived test modules. Fix cascade problems in test scripts due to incorrect assumptions about the name of the executable.
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-205-4/+5
| | | | | | | One-line changes: Wrap pickle.dump with staticmethod(). Keep softspace in Unbuffered wrapper class for backward compatibility with 3.x. Use ModuleType as a factory function rather than a base class. Derive exception class from something derived from BaseException (required for 3.x).
* Fix the updated code that uses os.walk() to remove matched directories.Steven Knight2010-04-201-5/+9
| | | | Also remove any .svn directories we find.
* Rewrite uses of reduce(), which is being deprecated for Python 3.x.Steven Knight2010-04-206-6/+21
|
* Remove the compat version of the tempfile.mkstemp() function.Steven Knight2010-04-191-35/+0
|
* Remove the compat shutil.move() function.Steven Knight2010-04-191-39/+0
|
* Remove the compat version of the "shlex" module.Steven Knight2010-04-195-351/+0
|
* Remove the compat version of the "textwrap" module.Steven Knight2010-04-195-396/+0
|
* Remove the compat version of the "optparse" module.Steven Knight2010-04-194-1727/+0
|
* Remove the compat version of the "itertools" module.Steven Knight2010-04-194-131/+0
|
* Remove compat fnmatch.filter() support.Steven Knight2010-04-191-28/+0
|
* Remove use of the "new" module from --debug=memoizer support.Steven Knight2010-04-193-125/+31
|
* Remove uses of the "new" module, replacing use of its functions withSteven Knight2010-04-191-10/+6
| | | | direct calls to the types.{Function,Method}Type classes.
* Index: test/Variables/help.pyGreg Noel2010-04-1910-149/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | =================================================================== --- test/Variables/help.py (revision 4792) +++ test/Variables/help.py (working copy) @@ -28,23 +28,15 @@ Test the Variables help messages. """ -import os.path +import os -try: - True, False -except NameError: - exec('True = (0 == 0)') - exec('False = (0 != 0)') +import TestSCons str_True = str(True) str_False = str(False) -import TestSCons - test = TestSCons.TestSCons() - - workpath = test.workpath() qtpath = os.path.join(workpath, 'qt') libpath = os.path.join(qtpath, 'lib') Index: test/Variables/PackageVariable.py =================================================================== --- test/Variables/PackageVariable.py (revision 4792) +++ test/Variables/PackageVariable.py (working copy) @@ -28,14 +28,8 @@ Test the PackageVariable canned Variable type. """ -import os.path +import os -try: - True, False -except NameError: - exec('True = (0 == 0)') - exec('False = (0 != 0)') - import TestSCons test = TestSCons.TestSCons() Index: test/Variables/BoolVariable.py =================================================================== --- test/Variables/BoolVariable.py (revision 4792) +++ test/Variables/BoolVariable.py (working copy) @@ -28,14 +28,8 @@ Test the BoolVariable canned Variable type. """ -import os.path +import os -try: - True, False -except NameError: - exec('True = (0 == 0)') - exec('False = (0 != 0)') - import TestSCons test = TestSCons.TestSCons() Index: test/Deprecated/Options/help.py =================================================================== --- test/Deprecated/Options/help.py (revision 4792) +++ test/Deprecated/Options/help.py (working copy) @@ -28,24 +28,16 @@ Test the Options help messages. """ -import os.path +import os import re -try: - True, False -except NameError: - exec('True = (0 == 0)') - exec('False = (0 != 0)') +import TestSCons str_True = str(True) str_False = str(False) -import TestSCons - test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) - - workpath = test.workpath() qtpath = os.path.join(workpath, 'qt') libpath = os.path.join(qtpath, 'lib') Index: test/Deprecated/Options/PackageOption.py =================================================================== --- test/Deprecated/Options/PackageOption.py (revision 4792) +++ test/Deprecated/Options/PackageOption.py (working copy) @@ -28,14 +28,8 @@ Test the PackageOption canned Option type. """ -import os.path +import os -try: - True, False -except NameError: - exec('True = (0 == 0)') - exec('False = (0 != 0)') - import TestSCons test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) Index: test/Deprecated/Options/BoolOption.py =================================================================== --- test/Deprecated/Options/BoolOption.py (revision 4792) +++ test/Deprecated/Options/BoolOption.py (working copy) @@ -28,12 +28,6 @@ Test the BoolOption canned Option type. """ -try: - True, False -except NameError: - exec('True = (0 == 0)') - exec('False = (0 != 0)') - import TestSCons test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) Index: src/script/scons-time.py =================================================================== --- src/script/scons-time.py (revision 4792) +++ src/script/scons-time.py (working copy) @@ -45,13 +45,6 @@ import time try: - True, False -except NameError: - # Pre-2.2 Python has no True or False keyword. - exec('True = not 0') - exec('False = not 1') - -try: sorted except NameError: # Pre-2.4 Python has no sorted() function. Index: src/engine/SCons/compat/_scons_builtins.py =================================================================== --- src/engine/SCons/compat/_scons_builtins.py (revision 4792) +++ src/engine/SCons/compat/_scons_builtins.py (working copy) @@ -37,13 +37,8 @@ all() any() - bool() - dict() sorted() memoryview() - True - False - zip() Implementations of functions are *NOT* guaranteed to be fully compliant with these functions in later versions of Python. We are only concerned @@ -62,22 +57,6 @@ import builtins try: - False -except NameError: - # Pre-2.2 Python has no False keyword. - exec('builtins.False = not 1') - # Assign to False in this module namespace so it shows up in pydoc output. - #False = False - -try: - True -except NameError: - # Pre-2.2 Python has no True keyword. - exec('builtins.True = not 0') - # Assign to True in this module namespace so it shows up in pydoc output. - #True = True - -try: all except NameError: # Pre-2.5 Python has no all() function. @@ -108,42 +87,6 @@ any = any try: - bool -except NameError: - # Pre-2.2 Python has no bool() function. - def bool(value): - """Demote a value to 0 or 1, depending on its truth value. - - This is not to be confused with types.BooleanType, which is - way too hard to duplicate in early Python versions to be - worth the trouble. - """ - return not not value - builtins.bool = bool - bool = bool - -try: - dict -except NameError: - # Pre-2.2 Python has no dict() keyword. - def dict(seq=[], **kwargs): - """ - New dictionary initialization. - """ - d = {} - for k, v in seq: - d[k] = v - d.update(kwargs) - return d - builtins.dict = dict - -try: - file -except NameError: - # Pre-2.2 Python has no file() function. - builtins.file = open - -try: memoryview except NameError: # Pre-2.7 doesn't have the memoryview() built-in. @@ -185,27 +128,6 @@ return result builtins.sorted = sorted -# -try: - zip -except NameError: - # Pre-2.2 Python has no zip() function. - def zip(*lists): - """ - Emulates the behavior we need from the built-in zip() function - added in Python 2.2. - - Returns a list of tuples, where each tuple contains the i-th - element rom each of the argument sequences. The returned - list is truncated in length to the length of the shortest - argument sequence. - """ - result = [] - for i in range(min(list(map(len, lists)))): - result.append(tuple([l[i] for l in lists])) - return result - builtins.zip = zip - #if sys.version_info[:3] in ((2, 2, 0), (2, 2, 1)): # def lstrip(s, c=string.whitespace): # while s and s[0] in c: Index: runtest.py =================================================================== --- runtest.py (revision 4792) +++ runtest.py (working copy) @@ -97,17 +97,6 @@ import time try: - x = True -except NameError: - True = not 0 - False = not 1 -else: - del x - -if not hasattr(os, 'WEXITSTATUS'): - os.WEXITSTATUS = lambda x: x - -try: sorted except NameError: # Pre-2.4 Python has no sorted() function. Index: QMTest/TestSCons.py =================================================================== --- QMTest/TestSCons.py (revision 4792) +++ QMTest/TestSCons.py (working copy) @@ -23,12 +23,6 @@ import sys import time -try: - True -except NameError: - exec('True = not 0') - exec('False = not 1') - from TestCommon import * from TestCommon import __all__
* Add a -3 option to print Python 3.x incompatibility warnings during tests.Steven Knight2010-04-191-2/+13
|
* Replace remaining os.path.walk() calls with os.walk().Steven Knight2010-04-1811-149/+117
|
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-1716-61/+41
| | | | | Fix the 'assignment to True or False' and the '__getitem__ not supported for exception classes' deprecation warnings.
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-164-13/+23
| | | | | Quiet the rest of the 'callable' warnings and fix the rest of the 'cmp argument' warnings.
* Refactory bin/* utilities to use os.walk() instead of os.path.walk().Steven Knight2010-04-163-25/+18
|
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-1515-51/+60
| | | | | | | | | Fixes due to running the regression tests with the '-3' option to Python2.6, which causes the run-time to look for potential compatibility problems with Python 3.x. In some cases, all we can do is quiet the warning since we still support Python versions that can't use the newer idiom. In other cases, we fix the problem. This patch contains a mix of quieting and fixing, plus a little lint.
* Refactor use of basestring to use exec() on attempted assignment ofSteven Knight2010-04-151-6/+5
| | | | | basestring to an internal variable (which we thenuse in a common is_basestring() utility function), to avoid triggering the basestring fixer.
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-1569-338/+312
| | | | | | Apply the first part of the 'raise' fixer (the three-argument cases are not converted and will need to wait until native support of with_traceback() is available).
* Eliminate / replace remaining cPickle references in test scripts.Steven Knight2010-04-142-4/+3
|
* Add a stub compat/_scon_dbm.py module and copy whichdb.whichdb() toSteven Knight2010-04-144-10/+73
| | | | dbm.whichdb() if necessary.
* Avoid 3.0 fixer issues by not using module names as variable names.Steven Knight2010-04-134-25/+51
|
* Issue 2336: Forward compatibility for use of the "builtins" moduleSteven Knight2010-04-127-57/+66
| | | | instead of __builtin__.
* Towards issue 2336: Rename the compat/builtins.py module toSteven Knight2010-04-113-2/+2
| | | | compat/_scons_builtings.py, to avoid the name conflict.
* Add compat "collections" module for pre-2.4 Python verseions. For now.Steven Knight2010-04-118-18/+77
|
* Issue 2331: For forward compatibility, use "import pickle" and haveSteven Knight2010-04-095-31/+56
| | | | the SCons.compat layer import cPickle as pickle when it's available.
* Issue 2330: For forward compatibility, use "import profile" and haveSteven Knight2010-04-092-4/+18
| | | | the SCons.compat layer import cProfile as profile when it's available.
* Remove the deleted _scons_UserString.py file from the packaging manifest.Steven Knight2010-04-081-1/+0
|
* Issue 2334: Use compatibility versions of collections.User{Dict,List,String}Steven Knight2010-04-0727-191/+115
| | | | | instead of the deprecated User{Dict,List,String} modules. The two test scripts that use User{List,String} fall back on ImportError by hand.
* Issue 2332: Convert from using StringIO.StringIO class to using theSteven Knight2010-04-0716-73/+132
| | | | | forward-compatible io.StringIO class, with the addition of an "io" compatibility module for Python versions before 2.6.
* Issue 2332 (preparation): refactor print statements so we canSteven Knight2010-04-064-11/+19
| | | | transition to using the Python 2.6 io.StringIO class.
* Fix test for non-win32 platformsWilliam Deegan2010-04-061-5/+4
|
* Fix vc9.0 express issue, misspelling, and add testcase which would have ↵William Deegan2010-04-062-1/+61
| | | | exposed the issue.
* Issue 2331: use cPickle in preference to the pickle module.Steven Knight2010-04-061-11/+11
|
* Fix XML in documentation, and in the bin/scons-doc.py script that generatesSteven Knight2010-04-0521-85/+94
| | | | the User's Guide XML from the .in files' SGML.
* Adding 1.3.0.d20100404William Deegan2010-04-052-3/+3
|
* Remove references to the removed _scons_sets15.py module.Steven Knight2010-04-022-5/+0
|
generated by cgit v0.12 at 2025-04-12 03:41:13 (GMT)