Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | fix for module loading to us importlib instead of imp (which no longer works ↵ | William Deegan | 2016-05-19 | 1 | -20/+48 | |
| | | | | | | | | in pyton3) | |||||
| * | merge | William Deegan | 2016-05-19 | 1 | -3/+13 | |
| |\ | ||||||
| | * | revert some py3 changes which fail no py2 on windows and any platform/python ↵ | William Deegan | 2016-05-15 | 1 | -3/+13 | |
| | | | | | | | | | | | | without dbm module installed. Revisit py3 issues after we get py2 working again | |||||
| * | | Fix py2/3 StringIO import | William Deegan | 2016-05-19 | 1 | -1/+6 | |
| |/ | ||||||
| * | fix incorrectly updated print formatting | William Deegan | 2016-05-15 | 1 | -1/+1 | |
| | | ||||||
| * | Fix re-raising exception so the syntax will work for both python3 and python2. | Bill | 2016-05-14 | 1 | -2/+7 | |
| | | ||||||
| * | fixes for print()'s for win32 | William Deegan | 2016-05-13 | 2 | -3/+7 | |
| | | ||||||
| * | Restore deleted function _scons_file() in win32.py. | William Deegan | 2016-05-13 | 1 | -0/+7 | |
| | | | | | | | | | | This is causing most tests to fail in win32. See if this resolves. | |||||
| * | fix error where IOError and OSError exceptions were falling through to the ↵ | William Deegan | 2016-05-12 | 1 | -3/+7 | |
| | | | | | | | | wrong case in Errors.py/convert_to_BuildError().. EnvironmentError is now just an alias in Py3 and it looks like the future module is not properly handling the py3 alias'ing and breaking the py2 exception class hierarchy. | |||||
| * | fix whitespace in generated dsp file to match expected in test harness. ↵ | William Deegan | 2016-05-12 | 1 | -5/+5 | |
| | | | | | | | | Editor or 2to3 was chopping trailing space | |||||
| * | copy src/engine/SCons/Tool/__init__.py as the merge had issues at some point ↵ | William Deegan | 2016-05-12 | 1 | -132/+43 | |
| | | | | | | | | in the past the the versioned shared library logic got mangled. Then 2to3 that file. Seems to e working now | |||||
| * | Fixed usage of linknames which needed to be defined outside of the two ↵ | William Deegan | 2016-05-09 | 1 | -1/+4 | |
| | | | | | | | | methods which share it's value and wasn't. Curious this only fails in python2.7 when __future__ is imported.. | |||||
| * | Add from future import print_function to fix broken tests under python2.7 | William Deegan | 2016-05-09 | 1 | -1/+6 | |
| | | ||||||
| * | py2/3 compatibility changes. | William Deegan | 2016-05-09 | 1 | -4/+18 | |
| | | ||||||
| * | Commit resolved conflicted merge. | Russel Winder | 2016-04-10 | 9 | -50/+275 | |
| |\ | ||||||
| * \ | Resolved conflicting merge. | Russel Winder | 2016-03-01 | 4 | -6/+100 | |
| |\ \ | ||||||
| * | | | Remove all the six stuff. | Russel Winder | 2016-02-02 | 7 | -710/+13 | |
| | | | | ||||||
| * | | | Commit merge from default. | Russel Winder | 2016-02-02 | 2 | -1/+7 | |
| |\ \ \ | ||||||
| * | | | | Resolving a batch of failing tests for python 2.7. | William Blevins | 2016-01-24 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | Note: please evaluate python 3.X compliance. | |||||
| * | | | | Merge in from default. | Russel Winder | 2016-01-15 | 2 | -9/+13 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Commit resolved conflicting merge. | Russel Winder | 2016-01-14 | 3 | -8/+31 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Output changed so changed expected results. | Russel Winder | 2016-01-10 | 1 | -21/+21 | |
| | | | | | | | ||||||
| * | | | | | | Remove relative import. | Russel Winder | 2016-01-10 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Some more print statements to functions. | Russel Winder | 2016-01-01 | 4 | -9/+9 | |
| | | | | | | | ||||||
| * | | | | | | Run futurize --stage1. | Russel Winder | 2016-01-01 | 15 | -116/+137 | |
| | | | | | | | ||||||
| * | | | | | | Post merge commit for safety. Building Fortran code works, but tests fail. | Russel Winder | 2015-12-24 | 144 | -5176/+5294 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merged default branch into python3-port to keep it up to date. | Gary Oberbrunner | 2014-08-23 | 45 | -404/+1419 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hand-updated a few things to keep them python3-safe, and handled several merge conflicts. | |||||
| * | | | | | | | | Added six module as SCons.compat.six, for python3 port. | Gary Oberbrunner | 2014-04-20 | 10 | -44/+724 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Added change log for python3 port | Gary Oberbrunner | 2014-04-06 | 1 | -0/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Main: No __future__.print_function (would affect exec()'d code). | Stefan Zimmermann | 2014-04-01 | 1 | -4/+6 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Main: Use exec() with compile(). | Stefan Zimmermann | 2014-04-01 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Tool.gs: Changed relative pdf import to absolute. | Stefan Zimmermann | 2014-03-31 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | engine.SCons: More bytes/str fixes. | Stefan Zimmermann | 2014-03-31 | 3 | -3/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Additional ()s for print. | Stefan Zimmermann | 2014-03-31 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merged with [default] | Stefan Zimmermann | 2014-03-31 | 166 | -486/+700 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix some minor 2to3 issues on windows | Rocco Matano | 2014-03-07 | 3 | -13/+16 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Some more six.PY2/PY3 usage. | Stefan Zimmermann | 2014-01-08 | 1 | -7/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merged with [default] | Stefan Zimmermann | 2014-03-31 | 32 | -351/+789 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Another list(*.keys()) for item deletion loop. | Stefan Zimmermann | 2013-12-27 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | ActionTests: No string.join(). b prefix for assert Action.get_contents(). | Stefan Zimmermann | 2013-12-27 | 1 | -37/+37 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | More __cmp__ to __eq__ (and __lt__). Resolved some UnboundLocalErrors after ↵ | Stefan Zimmermann | 2014-03-31 | 8 | -28/+37 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | except. | |||||
| * | | | | | | | | | | Use exec() with compile() to preserve script name. | Stefan Zimmermann | 2013-12-27 | 1 | -2/+2 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Environment.py: __cmp__ to __eq__. list(*.keys()) for item deletion loops. | Stefan Zimmermann | 2013-12-27 | 1 | -4/+4 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | copy_func: return 0 instead of return shutil.* | Stefan Zimmermann | 2013-12-27 | 1 | -3/+3 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Made former 2to3 changes Python 2.7 compatible (or removed unneeded changes). | Stefan Zimmermann | 2014-03-31 | 71 | -219/+273 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | setup.py: don't error on py3 | ndbecker2 | 2013-09-10 | 1 | -8/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (transplanted from 16fc64cadd68f2f9032c14d04bc0bf94f99b71a4) | |||||
| * | | | | | | | | | | fix for cpp scanner (maybe) | ndbecker2 | 2013-09-09 | 2 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (transplanted from c68b1a5da5ad47befc3a7e802d8ae23372f0e1a8) | |||||
| * | | | | | | | | | | minor cleanup | ndbecker2 | 2013-09-09 | 2 | -7/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (transplanted from 4feb1b15eb7a0c76cb020e09817c509a782d45b7) | |||||
| * | | | | | | | | | | 2 minor issues | ndbecker2 | 2013-09-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (transplanted from 6711a6b819f61764bb82c0f32a251b91ec66a0b2) | |||||
| * | | | | | | | | | | Manual python3 post-2to3 fixes from Neal Becker | Gary Oberbrunner | 2013-09-22 | 18 | -61/+75 | |
| | | | | | | | | | | |