Skip to content

Commit

Permalink
Backwards-compatibility changes for Python2.4
Browse files Browse the repository at this point in the history
git-svn-id: https://cxxtest.svn.sourceforge.net/svnroot/cxxtest/trunk@318 2f8b185b-e3eb-40a7-945f-4de83c84e57e
  • Loading branch information
whart222 authored and atomgalaxy committed Jan 7, 2012
1 parent 39eefaa commit a6a574b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion python/cxxtest/cxx_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
# TODO: document usage of this file
#

from __future__ import print_function, division
from __future__ import division

import os
import ply.lex as lex
Expand Down
10 changes: 5 additions & 5 deletions python/cxxtest/cxxtest_fog.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
# TODO: add test function names
#

from __future__ import print_function, division
from __future__ import division

import sys
import re
#from os.path import abspath, dirname
#sys.path.insert(0, dirname(dirname(abspath(__file__))))
#sys.path.insert(0, dirname(dirname(abspath(__file__)))+"/cxx_parse")
from .cxxtest_misc import abort
from . import cxx_parser
from cxxtest_misc import abort
import cxx_parser
import re

def cstr( str ):
Expand All @@ -32,10 +32,10 @@ def scanInputFiles(files, _options):
suites=[]
for file in files:
try:
print("Parsing file "+file, end='')
print("Parsing file "+file,)
sys.stdout.flush()
parse_info = cxx_parser.parse_cpp(filename=file,optimize=1)
except IOError as err:
except IOError, err:
print(" error.")
print(str(err))
continue
Expand Down
2 changes: 1 addition & 1 deletion python/cxxtest/cxxtest_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# the U.S. Government retains certain rights in this software.
#-------------------------------------------------------------------------

from __future__ import print_function, division
from __future__ import division

import codecs
import re
Expand Down
6 changes: 3 additions & 3 deletions python/cxxtest/cxxtestgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@

__all__ = ['main']

from . import __release__
import __release__
import os
import sys
import re
import glob
from optparse import OptionParser
from . import cxxtest_parser
import cxxtest_parser

try:
from . import cxxtest_fog
import cxxtest_fog
imported_fog=True
except ImportError:
imported_fog=False
Expand Down

0 comments on commit a6a574b

Please sign in to comment.