Commit d115454a authored by Yori Fournier's avatar Yori Fournier
Browse files

Merge branch 'tmp-merged' into 'dev'

Now compatible with python3 and 2.6

See merge request !20
parents 983e9e3d dcc96098
......@@ -104,8 +104,7 @@ if run4Test:
print(INFO + "TESTS: ")
for test in testList:
print
print
print('\n')
print(INFO + '{title:{c}^{n}}'.format(title=' ' + str(test.__name__) + ' ', c='=', n=72))
testStatus = myTest(test, True, fail, debug) # function, expected, fail, debug
if testStatus:
......@@ -116,8 +115,7 @@ if run4Test:
status = status and testStatus
# Print final status
print
print
print('\n')
print(INFO + 'Status of test series: ' + str(status))
if not status:
print(SPCE + 'Number of Failed Tests: ' + str(len(fail)))
......
from myTool import print2file
from myTool import print2screen
from myTool import getCurrentWindowIDs
from myTool import getFigOnWindow
from myTool import getWindow
from myTool import printListCurrentWindows
from myTool import window_exists
from myTool import setCurrentData
from myTool import giveDataToWindow
from myTool import drawFigOnWindow
from myTool import closeAllWindows
from myTool import closeWindow
from .myTool import print2file
from .myTool import print2screen
from .myTool import getCurrentWindowIDs
from .myTool import getFigOnWindow
from .myTool import getWindow
from .myTool import printListCurrentWindows
from .myTool import window_exists
from .myTool import setCurrentData
from .myTool import giveDataToWindow
from .myTool import drawFigOnWindow
from .myTool import closeAllWindows
from .myTool import closeWindow
from figOneAxes_base import FigOneAxes_base
from figOneAxes2D import FigOneAxes2D
from figOneAxes3D import FigOneAxes3D
from .figOneAxes_base import FigOneAxes_base
from .figOneAxes2D import FigOneAxes2D
from .figOneAxes3D import FigOneAxes3D
# Import --------------------------------------------------------------
from figOneAxes_base import FigOneAxes_base
from .figOneAxes_base import FigOneAxes_base
# Default values ------------------------------------------------------
_D_XRANGE = None
......
# Import --------------------------------------------------------------
from figOneAxes_base import FigOneAxes_base
from .figOneAxes_base import FigOneAxes_base
# Default values ------------------------------------------------------
_D_XRANGE = None
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment