summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | | revert some py3 changes which fail no py2 on windows and any platform/python ...William Deegan2016-05-151-3/+13
| | | * | | | | Fix py2/3 StringIO importWilliam Deegan2016-05-191-1/+6
| | | | |/ / / | | | |/| | |
| | | * | | | mergeWilliam Deegan2016-05-154-4/+16
| | | |\ \ \ \
| | | | * \ \ \ merge upstreamWilliam Deegan2016-05-154-4/+16
| | | | |\ \ \ \
| | | | | * \ \ \ Merged in williamblevins/scons_20150323/python3-port (pull request #330)William Deegan2016-05-154-4/+16
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | | * | | Fixed Fortran tests which were throughing missing include directory warning.William Blevins2016-05-154-4/+16
| | | * | | | | | change to handle py3 changes to byte/string for open().write()William Deegan2016-05-151-1/+5
| | | |/ / / / /
| | | * | | | | mergeWilliam Deegan2016-05-151-1/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | fix incorrectly updated print formattingWilliam Deegan2016-05-151-1/+1
| | | | |/ / /
| | | * | | | Update logic to pull files from mercurialWilliam Deegan2016-05-151-3/+3
| | | |/ / /
| | | * | | Fix print()Bill2016-05-141-1/+1
| | | * | | Fix print()Bill2016-05-141-1/+1
| | | * | | Fix print()Bill2016-05-141-1/+1
| | | * | | Fix re-raising exception so the syntax will work for both python3 and python2.Bill2016-05-141-2/+7
| | | * | | fix default open mode for test.write() to be wb.. it was changed to just w wh...William Deegan2016-05-141-1/+1
| | | * | | fixes for print()'s for win32William Deegan2016-05-135-7/+11
| | | * | | Restore deleted function _scons_file() in win32.py.William Deegan2016-05-131-0/+7
| | | * | | Fixed print()'s.William Deegan2016-05-131-1/+1
| | | * | | fix print statement in embedded string which generates SConstructWilliam Deegan2016-05-131-1/+1
| | | * | | Seeems like EnvironmentError is not yielding the proper error output from SCo...William Deegan2016-05-121-2/+2
| | | * | | fix print() conversion on testWilliam Deegan2016-05-121-5/+8
| | | * | | fix error where IOError and OSError exceptions were falling through to the wr...William Deegan2016-05-121-3/+7
| | | * | | fix broken test. 2to3 print changes broke some formatting. Changed output to ...William Deegan2016-05-121-5/+8
| | | * | | remove reference to six package.. unusedWilliam Deegan2016-05-121-1/+0
| | | * | | fix whitespace in generated dsp file to match expected in test harness. Edit...William Deegan2016-05-121-5/+5
| | | * | | copy src/engine/SCons/Tool/__init__.py as the merge had issues at some point ...William Deegan2016-05-121-132/+43
| | | * | | Fixed print()'s. Still some remaining issues. Check later.William Deegan2016-05-091-2/+2
| | | * | | Fixed print()'s. Still some remaining issues. Check later.William Deegan2016-05-091-8/+8
| | | * | | Fixed print()'sWilliam Deegan2016-05-091-8/+8
| | | * | | Fixed print()'sWilliam Deegan2016-05-091-2/+2
| | | * | | Fixed print()'sWilliam Deegan2016-05-091-2/+2
| | | * | | Fixed print()'sWilliam Deegan2016-05-091-2/+2
| | | * | | Fixed print()'sWilliam Deegan2016-05-091-9/+9
| | | * | | Fixed print()'sWilliam Deegan2016-05-091-3/+3
| | | * | | Fixed print()'sWilliam Deegan2016-05-091-1/+1
| | | * | | Fix typo in comment.William Deegan2016-05-091-1/+1
| | | * | | Fixed embedded SConscript/SConstruct's usage of print. Had no parens.William Deegan2016-05-091-5/+5
| | | * | | Fixed embedded SConscript/SConstruct's usage of print. Had no parens.William Deegan2016-05-091-2/+2
| | | * | | Fixed embedded SConscript/SConstruct's usage of print. Had no parens.William Deegan2016-05-091-16/+16
| | | * | | Fixed usage of linknames which needed to be defined outside of the two method...William Deegan2016-05-091-1/+4
| | | * | | Fix missing right parent in print () function in generated SConstruct.William Deegan2016-05-091-1/+2
| | | * | | 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
| | | * | | Guard checking for subprocess.mswindows by checking if on win32 platformWilliam Deegan2016-05-091-2/+2
| | | * | | mergedWilliam Deegan2016-05-08463-8884/+11646
| | | |\ \ \
| | | | * \ \ Commit resolved conflicted merge.Russel Winder2016-04-1058-216/+494
| | | | |\ \ \
| | | | * \ \ \ Resolved conflicting merge.Russel Winder2016-03-0116-45/+191
| | | | |\ \ \ \
| | | | * | | | | Remove all the six stuff.Russel Winder2016-02-0210-730/+17
| | | | * | | | | Commit merge from default.Russel Winder2016-02-025-1/+76
| | | | |\ \ \ \ \
| | | | * | | | | | Remove dummy file.Russel Winder2016-01-251-0/+0