summaryrefslogtreecommitdiffstats
path: root/src/script
Commit message (Collapse)AuthorAgeFilesLines
* Futurize stage 2 2to3 fixes only.William Blevins2016-09-202-140/+140
|
* revert some py3 changes which fail no py2 on windows and any platform/python ↵William Deegan2016-05-151-3/+13
| | | | without dbm module installed. Revisit py3 issues after we get py2 working again
* Commit resolved conflicted merge.Russel Winder2016-04-102-2/+141
|\
| * Merged in techtonik/scons (pull request #308)William Deegan2016-04-091-2/+2
| |\ | | | | | | | | | Improve a few docs and messages
| | * script/scons.py - improve error message on missing engine filesanatoly techtonik2016-03-021-2/+2
| | |
| * | Add some error recovery, cleanup scons-configure-cacheThomas Tanner2016-03-191-18/+34
| | |
| * | Cleanup of code/comments and rename and rewrite of upgrade scriptThomas Tanner2016-03-192-78/+123
| | |
| * | improve behaviourThomas Tanner2016-03-121-7/+23
| | |
| * | Change the cache to use the first two characters of the md5 for the directoryThomas Tanner2016-01-301-0/+62
| |/ | | | | | | name (more smaller directories, because they tend to get huge otherwise)
* | Remove all the six stuff.Russel Winder2016-02-021-8/+2
| |
* | Some more print statements to functions.Russel Winder2016-01-011-1/+2
| |
* | Run futurize --stage1.Russel Winder2016-01-011-0/+2
| |
* | Post merge commit for safety. Building Fortran code works, but tests fail.Russel Winder2015-12-243-49/+37
|\ \ | |/
| * removed several pre-2.7 methods and imports, including some basic refactoringsDirk Baechle2015-12-102-46/+34
| |
| * Merged in dirkbaechle/scons : switch of core classes to slots, memoizer ↵Dirk Baechle2015-08-061-1/+1
| |\ | | | | | | | | | subsystem now uses decorators
| | * - switching Node class and NodeInfo/Binfo to using slotsDirk Baechle2015-02-261-1/+1
| | | | | | | | | | | | - memoizer subsystem now uses decorators instead of the metaclass approach
| * | Fix premature SyntaxError on Python 3anatoly techtonik2015-06-201-1/+1
| |/ | | | | | | This allows to show correct message for Python 3 users
* | Added six module as SCons.compat.six, for python3 port.Gary Oberbrunner2014-04-201-2/+2
| |
* | Additional ()s for print.Stefan Zimmermann2014-03-311-1/+1
| |
* | Merged with [default]Stefan Zimmermann2014-03-311-6/+13
|\ \ | |/
| * remove double reporting of source path per comment by Anatoly in pull feedbackWilliam Deegan2014-03-091-1/+1
| |
| * Updated comment to indicate new order of priority for loading SCons python ↵William Deegan2014-03-091-1/+1
| | | | | | | | packages
| * restore SCONS_LIB_DIR to primary choice for SCons logic, then source tree ↵William Deegan2014-03-091-4/+7
| | | | | | | | from which it was run.
| * The change didn't get into 2.3.1anatoly techtonik2014-03-041-1/+1
| |
| * Several fixes for running scons.py from sourceanatoly techtonik2014-02-261-7/+11
| |
* | Made former 2to3 changes Python 2.7 compatible (or removed unneeded changes).Stefan Zimmermann2014-03-312-8/+14
| |
* | Manual python3 post-2to3 fixes from Neal BeckerGary Oberbrunner2013-09-221-5/+5
| |
* | Result of raw 2to3 run (2to3-2.7); checkpoint for python3 conversion.Gary Oberbrunner2013-09-222-43/+44
|/
* Removed some pre-Python 2.4 compatibility codeanatoly techtonik2012-12-071-12/+6
|
* Ability to run scripts/scons.py directly from source checkout.anatoly techtonik2012-11-161-1/+9
|
* Fixed error on Windows when there is a space in the Python installation ↵Richard Viney2012-08-311-1/+1
| | | | directory (http://scons.tigris.org/issues/show_bug.cgi?id=2790)
* make .bat files execute .py script with the same name instead of trying to ↵Anatoly Techtonik2011-04-161-1/+4
| | | | | | set sys.path inline it is a final fix for issue #2051 to make SCons easy_installable on Windows
* fix issue #2051 - broken installation with easy_install on WindowsAnatoly Techtonik2011-04-142-29/+29
| | | | the fix was only committed for unix previously
* Revert App Paths patch. `cmd.exe` doesn't use App Paths andAnatoly Techtonik2011-04-071-91/+0
| | | | | | | it will cause a lot ot confusion for command line users, because `scons` is still can be invoked with `start`. See http://scons.tigris.org/issues/show_bug.cgi?id=1883#desc12
* Remove unused setup.py/setup.cfg (issue #2562)Anatoly Techtonik2011-04-072-57/+0
|
* Improve python 3.x not supported error message.Gary Oberbrunner2011-01-121-1/+2
|
* Tigris issue 2562William Deegan2010-08-221-169/+0
| | | | | http://scons.tigris.org/issues/show_bug.cgi?id=2562 Delete obsolete files
* Convert old-style classes in src/script to new-style classes.Steven Knight2010-05-202-5/+5
|
* Fix regression tests (imports not happening as expected)Greg Noel2010-04-251-9/+6
|
* Add compat support for renaming '_winreg' as 'winreg' in Python 3.x.Greg Noel2010-04-251-7/+16
|
* Convert to Python 3.x division rules.Greg Noel2010-04-241-4/+4
|
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-242-3/+0
| | | | | | | 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.
* Index: test/Variables/help.pyGreg Noel2010-04-191-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | =================================================================== --- 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__
* Replace remaining os.path.walk() calls with os.walk().Steven Knight2010-04-181-4/+3
|
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-04-171-9/+4
| | | | | 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-161-1/+14
| | | | | Quiet the rest of the 'callable' warnings and fix the rest of the 'cmp argument' warnings.
* Add a stub compat/_scon_dbm.py module and copy whichdb.whichdb() toSteven Knight2010-04-141-8/+12
| | | | dbm.whichdb() if necessary.
* A bit of a blind checkin, but there's no need to put the compatibility namesGreg Noel2010-03-311-5/+2
| | | | | in the __builtin__ namespace, as this program only imports standard Python modules, which shouldn't need any such names.
* http://scons.tigris.org/issues/show_bug.cgi?id=2345Greg Noel2010-03-292-5/+4
| | | | | | | | | | | | | The 'buffer' fixer simply replaces 'buffer( ... )' with 'memoryview( ... )', which is incorrect for our cases, so these changes had to be done by hand and a forward-compatibility class added. The 'xrange' fixer was applied. Manual changes were minimal: a few case in test strings and one use of 'range' as an identifer in the same scope as where 'xrange' was converted to 'range'. The "sets15" compat function, which provided backward compatibility for Python versions prior to 2.2, was removed as no longer needed.
* http://scons.tigris.org/issues/show_bug.cgi?id=2329Greg Noel2010-03-272-15/+31
| | | | | | | | | | | | | | | Applied a number of idiomatic changes. Uses of the 'sort()' method were converted into calls of 'sorted()' when possible and the sorted() expression was inserted into a subsequent statement whenever that made sense. The statement 'while 1:' was changed to 'while True:'. Names from the 'types' module (e.g., 'types.FooType') were converted to the equivalent build-in type (e.g., 'foo'). Comparisons between types were changed to use 'isinstance()'.
generated by cgit v0.12 at 2024-11-17 23:36:10 (GMT)