/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tools/rst2pdf.py

  • Committer: Martin
  • Date: 2018-06-30 23:39:17 UTC
  • mto: This revision was merged to the branch mainline in revision 7013.
  • Revision ID: gzlist@googlemail.com-20180630233917-4lh8na2wist64hab
Make replacement for lazy import tests less dodgy

Should fix tests that fail under CI but seem to pass locally by not
doing an unsafe replacement of the __import__ builtin. Instead alias
it at the module level for replacement in testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/rst2pdf.py
63
63
    import rubber.cmdline
64
64
    import rubber.cmd_pipe
65
65
except ImportError:
66
 
    print "Cannot find the rubber modules, rubber not installed correctly."
 
66
    print("Cannot find the rubber modules, rubber not installed correctly.")
67
67
    sys.exit(1)
68
68
 
69
69
# Generate the latex file
157
157
# Rename output to _destination or print to stdout::
158
158
 
159
159
if destination is None:
160
 
    pdffile = file(pdfpath)
161
 
    print  pdffile.read()
162
 
    pdffile.close()
 
160
    with open(pdfpath) as pdffile:
 
161
        print(pdffile.read())
163
162
else:
164
163
    os.rename(pdfpath, destination)
165
164