summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * fix for module loading to us importlib instead of imp (which no longer works ↵William Deegan2016-05-191-20/+48
| | | | | | | | in pyton3)
| * mergeWilliam Deegan2016-05-191-3/+13
| |\
| | * 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
| * | Fix py2/3 StringIO importWilliam Deegan2016-05-191-1/+6
| |/
| * fix incorrectly updated print formattingWilliam Deegan2016-05-151-1/+1
| |
| * Fix re-raising exception so the syntax will work for both python3 and python2.Bill2016-05-141-2/+7
| |
| * fixes for print()'s for win32William Deegan2016-05-132-3/+7
| |
| * Restore deleted function _scons_file() in win32.py.William Deegan2016-05-131-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 Deegan2016-05-121-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 Deegan2016-05-121-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 Deegan2016-05-121-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 Deegan2016-05-091-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.7William Deegan2016-05-091-1/+6
| |
| * py2/3 compatibility changes.William Deegan2016-05-091-4/+18
| |
| * Commit resolved conflicted merge.Russel Winder2016-04-109-50/+275
| |\
| * \ Resolved conflicting merge.Russel Winder2016-03-014-6/+100
| |\ \
| * | | Remove all the six stuff.Russel Winder2016-02-027-710/+13
| | | |
| * | | Commit merge from default.Russel Winder2016-02-022-1/+7
| |\ \ \
| * | | | Resolving a batch of failing tests for python 2.7.William Blevins2016-01-241-4/+2
| | | | | | | | | | | | | | | | | | | | Note: please evaluate python 3.X compliance.
| * | | | Merge in from default.Russel Winder2016-01-152-9/+13
| |\ \ \ \
| * \ \ \ \ Commit resolved conflicting merge.Russel Winder2016-01-143-8/+31
| |\ \ \ \ \
| * | | | | | Output changed so changed expected results.Russel Winder2016-01-101-21/+21
| | | | | | |
| * | | | | | Remove relative import.Russel Winder2016-01-101-1/+1
| | | | | | |
| * | | | | | Some more print statements to functions.Russel Winder2016-01-014-9/+9
| | | | | | |
| * | | | | | Run futurize --stage1.Russel Winder2016-01-0115-116/+137
| | | | | | |
| * | | | | | Post merge commit for safety. Building Fortran code works, but tests fail.Russel Winder2015-12-24144-5176/+5294
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merged default branch into python3-port to keep it up to date.Gary Oberbrunner2014-08-2345-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 Oberbrunner2014-04-2010-44/+724
| | | | | | | | |
| * | | | | | | | Added change log for python3 portGary Oberbrunner2014-04-061-0/+3
| | | | | | | | |
| * | | | | | | | Main: No __future__.print_function (would affect exec()'d code).Stefan Zimmermann2014-04-011-4/+6
| | | | | | | | |
| * | | | | | | | Main: Use exec() with compile().Stefan Zimmermann2014-04-011-1/+1
| | | | | | | | |
| * | | | | | | | Tool.gs: Changed relative pdf import to absolute.Stefan Zimmermann2014-03-311-1/+1
| | | | | | | | |
| * | | | | | | | engine.SCons: More bytes/str fixes.Stefan Zimmermann2014-03-313-3/+3
| | | | | | | | |
| * | | | | | | | Additional ()s for print.Stefan Zimmermann2014-03-311-1/+1
| | | | | | | | |
| * | | | | | | | Merged with [default]Stefan Zimmermann2014-03-31166-486/+700
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix some minor 2to3 issues on windowsRocco Matano2014-03-073-13/+16
| | | | | | | | | |
| * | | | | | | | | Some more six.PY2/PY3 usage.Stefan Zimmermann2014-01-081-7/+4
| | | | | | | | | |
| * | | | | | | | | Merged with [default]Stefan Zimmermann2014-03-3132-351/+789
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Another list(*.keys()) for item deletion loop.Stefan Zimmermann2013-12-271-1/+1
| | | | | | | | | | |
| * | | | | | | | | | ActionTests: No string.join(). b prefix for assert Action.get_contents().Stefan Zimmermann2013-12-271-37/+37
| | | | | | | | | | |
| * | | | | | | | | | More __cmp__ to __eq__ (and __lt__). Resolved some UnboundLocalErrors after ↵Stefan Zimmermann2014-03-318-28/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | except.
| * | | | | | | | | | Use exec() with compile() to preserve script name.Stefan Zimmermann2013-12-271-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Environment.py: __cmp__ to __eq__. list(*.keys()) for item deletion loops.Stefan Zimmermann2013-12-271-4/+4
| | | | | | | | | | |
| * | | | | | | | | | copy_func: return 0 instead of return shutil.*Stefan Zimmermann2013-12-271-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Made former 2to3 changes Python 2.7 compatible (or removed unneeded changes).Stefan Zimmermann2014-03-3171-219/+273
| | | | | | | | | | |
| * | | | | | | | | | setup.py: don't error on py3ndbecker22013-09-101-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (transplanted from 16fc64cadd68f2f9032c14d04bc0bf94f99b71a4)
| * | | | | | | | | | fix for cpp scanner (maybe)ndbecker22013-09-092-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (transplanted from c68b1a5da5ad47befc3a7e802d8ae23372f0e1a8)
| * | | | | | | | | | minor cleanupndbecker22013-09-092-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (transplanted from 4feb1b15eb7a0c76cb020e09817c509a782d45b7)
| * | | | | | | | | | 2 minor issuesndbecker22013-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (transplanted from 6711a6b819f61764bb82c0f32a251b91ec66a0b2)
| * | | | | | | | | | Manual python3 post-2to3 fixes from Neal BeckerGary Oberbrunner2013-09-2218-61/+75
| | | | | | | | | | |