reportlab-2.2: first stage changes in on the trunk
authorrgbecker
Wed, 03 Sep 2008 17:22:41 +0000
changeset 2967 ea62529bd1df
parent 2966 c9df63ccabdf
child 2968 229551dc1b66
reportlab-2.2: first stage changes in on the trunk
INSTALL.txt
demos/colors/colortest.py
demos/gadflypaper/gfe.py
demos/odyssey/dodyssey.py
demos/odyssey/fodyssey.py
demos/odyssey/odyssey.py
demos/stdfonts/stdfonts.py
demos/tests/testdemos.py
docs/graphguide/ch5_charts.py
docs/graphguide/gengraphguide.py
docs/reference/genreference.py
docs/userguide/ch1_intro.py
docs/userguide/ch2_graphics.py
docs/userguide/ch2a_fonts.py
docs/userguide/genuserguide.py
setup.cfg
src/reportlab/graphics/barcode/test.py
src/reportlab/pdfgen/canvas.py
src/reportlab/pdfgen/pycanvas.py
src/reportlab/platypus/tables.py
tests/__init__.py
tests/runAll.py
tests/test_charts_textlabels.py
tests/test_extra.py
tests/test_graphics_charts.py
tests/test_graphics_layout.py
tests/test_graphics_speed.py
tests/test_hello.py
tests/test_invariant.py
tests/test_lib_colors.py
tests/test_lib_sequencer.py
tests/test_paragraphs.py
tests/test_pdfbase_pdfmetrics.py
tests/test_pdfbase_pdfutils.py
tests/test_pdfbase_postscript.py
tests/test_pdfgen_callback.py
tests/test_pdfgen_general.py
tests/test_pdfgen_links.py
tests/test_pdfgen_pagemodes.py
tests/test_platypus_breaking.py
tests/test_platypus_general.py
tests/test_platypus_indents.py
tests/test_platypus_leftright.py
tests/test_platypus_pleaseturnover.py
tests/test_platypus_toc.py
tests/test_platypus_xref.py
tests/test_widgetbase_tpc.py
tests/utils.py
tools/docco/graphdocpy.py
tools/pythonpoint/pythonpoint.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/INSTALL.txt	Wed Sep 03 17:22:41 2008 +0000
@@ -0,0 +1,18 @@
+0)	All install Python, freetype2 and PIL
+	unixers will need development versions of python and freetype2.
+	Windows edit setup.cfg to add the path to the freetype2 .lib
+	and the freetype2 include files
+
+
+1)	python setup.py tests-preinstall
+
+2)	python setup.py install
+	if you see trailing message saaying installed renderPM with freetype
+	then things should be OK. If it fails to locate freetype you may see
+	installed renderPm without freetype no ttf; sorry.
+
+3)	python setup.py tests
+
+
+hopefully the tests in 1 should complain about not having renderPM and in
+2 should not.
--- a/demos/colors/colortest.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/demos/colors/colortest.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,6 +1,6 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/demos/colors/colortest.py
+__version__='''$Id:$'''
 import reportlab.pdfgen.canvas
 from reportlab.lib import colors
 from reportlab.lib.units import inch
--- a/demos/gadflypaper/gfe.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/demos/gadflypaper/gfe.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,8 +1,7 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/demos/gadflypaper/gfe.py
+__doc__=''
 __version__=''' $Id$ '''
-__doc__=''
 
 #REPORTLAB_TEST_SCRIPT
 import sys
@@ -900,4 +899,4 @@
 p("""[Gadfly]Gadfly: SQL Relational Database in Python,
 http://www.chordate.com/kwParsing/gadfly.html""")
 
-go()
\ No newline at end of file
+go()
--- a/demos/odyssey/dodyssey.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/demos/odyssey/dodyssey.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,6 +1,5 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/demos/odyssey/dodyssey.py
 __version__=''' $Id$ '''
 __doc__=''
 
--- a/demos/odyssey/fodyssey.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/demos/odyssey/fodyssey.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,6 +1,5 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/demos/odyssey/fodyssey.py
 __version__=''' $Id$ '''
 __doc__=''
 
@@ -162,4 +161,4 @@
     if os.path.isfile(fn):
         break
 if __name__=='__main__':
-    parseOdyssey(fn)
\ No newline at end of file
+    parseOdyssey(fn)
--- a/demos/odyssey/odyssey.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/demos/odyssey/odyssey.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,6 +1,5 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/demos/odyssey/odyssey.py
 __version__=''' $Id$ '''
 ___doc__=''
 #odyssey.py
@@ -148,4 +147,4 @@
 
 if __name__=='__main__':
     quiet = ('-q' in sys.argv)
-    run(verbose = not quiet)
\ No newline at end of file
+    run(verbose = not quiet)
--- a/demos/stdfonts/stdfonts.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/demos/stdfonts/stdfonts.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,7 +1,5 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/demos/stdfonts/stdfonts.py
-__version__=''' $Id$ '''
 __doc__="""
 This generates tables showing the 14 standard fonts in both
 WinAnsi and MacRoman encodings, and their character codes.
@@ -11,6 +9,7 @@
 
 usage: standardfonts.py [dec|hex|oct]
 """
+__version__=''' $Id$ '''
 import sys
 from reportlab.pdfbase import pdfmetrics
 from reportlab.pdfgen import canvas
--- a/demos/tests/testdemos.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/demos/tests/testdemos.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,9 +1,8 @@
 #!/bin/env python
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/demos/tests/testdemos.py
+__doc__='Test all demos'
 __version__=''' $Id$ '''
-__doc__='Test all demos'
 _globals=globals().copy()
 import os, sys
 from reportlab import pdfgen
@@ -11,4 +10,4 @@
 for p in ('pythonpoint/pythonpoint.py','stdfonts/stdfonts.py','odyssey/odyssey.py', 'gadflypaper/gfe.py'):
     fn = os.path.normcase(os.path.normpath(os.path.join(os.path.dirname(pdfgen.__file__),'..','demos',p)))
     os.chdir(os.path.dirname(fn))
-    execfile(fn,_globals.copy())
\ No newline at end of file
+    execfile(fn,_globals.copy())
--- a/docs/graphguide/ch5_charts.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/docs/graphguide/ch5_charts.py	Wed Sep 03 17:22:41 2008 +0000
@@ -239,7 +239,7 @@
 disc("""
 To see many more examples of $Label$ objects with different
 combinations of properties, please have a look into the
-ReportLab test suite in the folder $reportlab/test$, run the
+ReportLab test suite in the folder $tests$, run the
 script $test_charts_textlabels.py$ and look at the PDF document
 it generates!
 """)
--- a/docs/graphguide/gengraphguide.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/docs/graphguide/gengraphguide.py	Wed Sep 03 17:22:41 2008 +0000
@@ -40,7 +40,7 @@
 
 def makeSuite():
     "standard test harness support - run self as separate process"
-    from reportlab.test.utils import ScriptThatMakesFileTest
+    from tests.utils import ScriptThatMakesFileTest
     return ScriptThatMakesFileTest('../docs/graphguide', 'gengraphguide.py', 'graphguide.pdf')
 
 def main():
--- a/docs/reference/genreference.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/docs/reference/genreference.py	Wed Sep 03 17:22:41 2008 +0000
@@ -23,7 +23,7 @@
 
 def makeSuite():
     "standard test harness support - run self as separate process"
-    from reportlab.test.utils import ScriptThatMakesFileTest
+    from tests.utils import ScriptThatMakesFileTest
     return ScriptThatMakesFileTest('../docs/reference', 'genreference.py', 'reference.pdf')
 
 
--- a/docs/userguide/ch1_intro.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/docs/userguide/ch1_intro.py	Wed Sep 03 17:22:41 2008 +0000
@@ -174,7 +174,7 @@
 corresponding .pyd files from our download page. """)
 
 
-list("""$cd$ to ^reportlab/test^ and execute $runAll.py$.
+list("""$cd$ to ^tests^ and execute $runAll.py$.
 This will create many PDF files. """)
 list("""You may also want to download and run the ^rl_check.py^ on our site, which
 health-checks an installation and reports on any missing options.  """)
@@ -240,7 +240,7 @@
 them into ^C:\Python24\lib\site-packages^ (or its equivalent for other Python versions""")
 
 list("""Open up a $MS-DOS$ command prompt and CD to
-"$..\\reportlab\\test$".  Enter "$runAll.py$". You should see lots of dots
+"$reportlab\\..\\tests$".  Enter "$runAll.py$". You should see lots of dots
 and no error messages.  This will also create many PDF files and generate
 the manuals in ^reportlab/docs^ (including this one). """)
 
--- a/docs/userguide/ch2_graphics.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/docs/userguide/ch2_graphics.py	Wed Sep 03 17:22:41 2008 +0000
@@ -289,7 +289,7 @@
 disc("""
 You need the Python Imaging Library (PIL) to use images with the ReportLab package.
 Examnples of the techniques below can be found by running the script $test_pdfgen_general.py$
-in our $test$ subdirectory and looking at page 7 of the output.
+in our $tests$ subdirectory and looking at page 7 of the output.
 """)
 
 disc("""
--- a/docs/userguide/ch2a_fonts.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/docs/userguide/ch2a_fonts.py	Wed Sep 03 17:22:41 2008 +0000
@@ -411,10 +411,10 @@
 only relevant if you need to construct vertical text.  We aim to add more readable options
 for horizontal and vertical text to the UnicodeCIDFont constructor in future.
 The following four test scripts generate samples in the corresponding languages:""")
-eg("""reportlab/test/test_multibyte_jpn.py
-reportlab/test/test_multibyte_kor.py
-reportlab/test/test_multibyte_chs.py
-reportlab/test/test_multibyte_cht.py""")
+eg("""tests/test_multibyte_jpn.py
+tests/test_multibyte_kor.py
+tests/test_multibyte_chs.py
+tests/test_multibyte_cht.py""")
 
 ## put back in when we have vertical text...
 ##disc("""The illustration below shows part of the first page
--- a/docs/userguide/genuserguide.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/docs/userguide/genuserguide.py	Wed Sep 03 17:22:41 2008 +0000
@@ -45,7 +45,7 @@
 
 def makeSuite():
     "standard test harness support - run self as separate process"
-    from reportlab.test.utils import ScriptThatMakesFileTest
+    from tests.utils import ScriptThatMakesFileTest
     return ScriptThatMakesFileTest('../docs/userguide', 'genuserguide.py', 'userguide.pdf')
 
 def main():
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/setup.cfg	Wed Sep 03 17:22:41 2008 +0000
@@ -0,0 +1,5 @@
+#This is normally only used for win32
+[FREETYPE]
+#lib=path to your freetype2 .lib file  eg C:\Python\devel\freetype-2.1.5\objs\freetype214.lib
+#libdir=path the the containing folder; leave empty uses dirname(of the lib)
+#incdir=path to the include files for your setup or it uses ../include from the libdir
--- a/src/reportlab/graphics/barcode/test.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/src/reportlab/graphics/barcode/test.py	Wed Sep 03 17:22:41 2008 +0000
@@ -10,8 +10,6 @@
 from reportlab.graphics.barcode.usps4s import USPS_4State
 
 
-from reportlab.test import unittest
-from reportlab.test.utils import makeSuiteForClasses, outputfile, printLocation
 from reportlab.platypus import Spacer, SimpleDocTemplate, Table, TableStyle, Preformatted, PageBreak
 from reportlab.lib.units import inch, cm
 from reportlab.lib import colors
--- a/src/reportlab/pdfgen/canvas.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/src/reportlab/pdfgen/canvas.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1522,4 +1522,4 @@
     Canvas._escape = new.instancemethod(_instanceEscapePDF,None,Canvas)
 
 if __name__ == '__main__':
-    print 'For test scripts, look in reportlab/test'
+    print 'For test scripts, look in tests'
--- a/src/reportlab/pdfgen/pycanvas.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/src/reportlab/pdfgen/pycanvas.py	Wed Sep 03 17:22:41 2008 +0000
@@ -25,14 +25,14 @@
 is returned and the doIt() function is much much faster, it is also
 much faster than the original non-serialized program.
 
-the reportlab/test/test_pdfgen_pycanvas.py program is the test suite
+the tests/test_pdfgen_pycanvas.py program is the test suite
 for pycanvas, you can do the following to run it :
 
     First set verbose=1 in reportlab/rl_config.py
 
     then from the command interpreter :
 
-    $ cd reportlab/test
+    $ cd tests
     $ python test_pdfgen_pycanvas.py >n1.py
 
     this will produce both n1.py and test_pdfgen_pycanvas.pdf
@@ -306,4 +306,4 @@
         self._pyfile.write("%s\n" % pycode)
 
 if __name__ == '__main__':
-    print 'For test scripts, look in reportlab/test'
+    print 'For test scripts, look in tests'
--- a/src/reportlab/platypus/tables.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/src/reportlab/platypus/tables.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1518,5 +1518,5 @@
 # of colors e.g. Blue, None, Blue, None as you move
 # down.
 if __name__ == '__main__':
-    from reportlab.test.test_platypus_tables import old_tables_test
+    from tests.test_platypus_tables import old_tables_test
     old_tables_test()
--- a/tests/__init__.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/__init__.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,3 +1,2 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/__init__.py
--- a/tests/runAll.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/runAll.py	Wed Sep 03 17:22:41 2008 +0000
@@ -48,10 +48,10 @@
                 except:
                     pass
 
-    # special case for reportlab/test directory - clean up
+    # special case for tests directory - clean up
     # all PDF & log files before starting run.  You don't
     # want this if reusing runAll anywhere else.
-    if string.find(folder, 'reportlab' + os.sep + 'test') > -1: cleanup(folder)
+    if string.find(folder, os.sep+'tests') > -1: cleanup(folder)
     cleanup(outputfile(''))
     NI = []
     cleanOnly = '--clean' in sys.argv
--- a/tests/test_charts_textlabels.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_charts_textlabels.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,6 +1,5 @@
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_charts_textlabels.py
 """
 Tests for the text Label class.
 """
--- a/tests/test_extra.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_extra.py	Wed Sep 03 17:22:41 2008 +0000
@@ -11,13 +11,13 @@
     This test case runs additional test cases defined in external
     modules which must also be using the unittest framework.
     These additional modules must be defined in a file named
-    'extra.txt' which needs to be located in the reportlab/test
+    'extra.txt' which needs to be located in the tests
     folder and contains one path per line.
 
     The paths of these modules can contain stuff from the Unix
     world like '~', '.', '..' and '$HOME' and can have absolute
     or relative paths. If they are relative they start from the
-    reportlab/test folder.
+    tests folder.
 
     This is a sample 'extra.txt' file:
 
--- a/tests/test_graphics_charts.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_graphics_charts.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,6 +1,5 @@
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_graphics_charts.py
 """
 Tests for chart class.
 """
--- a/tests/test_graphics_layout.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_graphics_layout.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,6 +1,5 @@
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_graphics_layout.py
 """
 Tests for getBounds methods of various graphical widgets
 """
--- a/tests/test_graphics_speed.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_graphics_speed.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,11 +1,10 @@
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_graphics_speed.py
 """
 This does a test drawing with lots of things in it, running
 with and without attribute checking.
 """
-__version__ = ''' $Id $ '''
+__version__ = '''$Id$'''
 import os, sys, time
 import reportlab.rl_config
 import unittest
--- a/tests/test_hello.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_hello.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,8 +1,7 @@
 #!/bin/env python
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_hello.py
-__version__=''' $Id'''
+__version__='''$Id$'''
 __doc__="""most basic test possible that makes a PDF.
 
 Useful if you want to test that a really minimal PDF is healthy,
--- a/tests/test_invariant.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_invariant.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,11 +1,10 @@
 #!/bin/env python
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_invariant.py
-__version__=''' $Id'''
 __doc__="""Verfy that if in invariant mode, repeated runs
 make identical file.  This does NOT test across platforms
 or python versions, only a user can do that :-)"""
+__version__='''$Id:$'''
 
 import unittest
 from tests.utils import makeSuiteForClasses, outputfile, printLocation, testsFolder
--- a/tests/test_lib_colors.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_lib_colors.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,21 +1,16 @@
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_lib_colors.py
 """Tests for the reportlab.lib.colors module.
 """
-
-
+__version__='''$Id:$'''
 import os, math
-
 import unittest
 from tests.utils import makeSuiteForClasses, outputfile, printLocation
-
 from reportlab.pdfgen.canvas import Canvas
 import reportlab.pdfgen.canvas
 from reportlab.lib import colors
 from reportlab.lib.units import inch, cm
 
-
 def framePage(canvas, title):
     canvas.setFont('Times-BoldItalic',20)
     canvas.drawString(inch, 10.5 * inch, title)
--- a/tests/test_lib_sequencer.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_lib_sequencer.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,12 +1,9 @@
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_lib_sequencer.py
 """Tests for the reportlab.lib.sequencer module.
 """
-
-
+__version__='''$Id:$'''
 import sys, random
-
 import unittest
 from tests.utils import makeSuiteForClasses, printLocation
 from reportlab.lib.sequencer import Sequencer
--- a/tests/test_paragraphs.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_paragraphs.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,7 +1,7 @@
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_paragraphs.py
 # tests some paragraph styles
+__version__='''$Id:$'''
 
 import unittest
 from tests.utils import makeSuiteForClasses, outputfile, printLocation
--- a/tests/test_pdfbase_pdfmetrics.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_pdfbase_pdfmetrics.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,6 +1,5 @@
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_pdfbase_pdfmetrics.py
 #test_pdfbase_pdfmetrics_widths
 """
 Various tests for PDF metrics.
@@ -8,6 +7,7 @@
 The main test prints out a PDF documents enabling checking of widths of every
 glyph in every standard font.  Long!
 """
+__version__='''$Id:$'''
 import unittest
 from tests.utils import makeSuiteForClasses, outputfile, printLocation
 from reportlab.pdfbase import pdfmetrics
--- a/tests/test_pdfbase_pdfutils.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_pdfbase_pdfutils.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,19 +1,14 @@
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_pdfbase_pdfutils.py
 """Tests for utility functions in reportlab.pdfbase.pdfutils.
 """
-
-
+__version__='''$Id:$'''
 import os
-
 import unittest
 from tests.utils import makeSuiteForClasses, printLocation
-
 from reportlab.pdfbase.pdfutils import _AsciiHexEncode, _AsciiHexDecode
 from reportlab.pdfbase.pdfutils import _AsciiBase85Encode, _AsciiBase85Decode
 
-
 class PdfEncodingTestCase(unittest.TestCase):
     "Test various encodings used in PDF files."
 
--- a/tests/test_pdfbase_postscript.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_pdfbase_postscript.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,13 +1,12 @@
 #!/bin/env python
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_pdfbase_postscript.py
-__version__=''' $Id'''
 __doc__="""Tests Postscript XObjects.
 
 Nothing visiblke in Acrobat, but the resulting files
 contain graphics and tray commands if exported to
 a Postscript device in Acrobat 4.0"""
+__version__='''$Id:$'''
 
 import unittest
 from tests.utils import makeSuiteForClasses, outputfile, printLocation
--- a/tests/test_pdfgen_callback.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_pdfgen_callback.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,9 +1,8 @@
 #!/bin/env python
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_pdfgen_callback.py
+__doc__='checks callbacks work'
 __version__=''' $Id$ '''
-__doc__='checks callbacks work'
 
 import unittest
 from tests.utils import makeSuiteForClasses, outputfile, printLocation
--- a/tests/test_pdfgen_general.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_pdfgen_general.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,16 +1,12 @@
 #!/bin/env python
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_pdfgen_general.py
+__doc__='testscript for reportlab.pdfgen'
 __version__=''' $Id$ '''
-__doc__='testscript for reportlab.pdfgen'
 #tests and documents new low-level canvas
-
 import os, string
-
 import unittest
 from tests.utils import makeSuiteForClasses, outputfile, printLocation, testsFolder
-
 from reportlab.pdfgen import canvas   # gmcm 2000/10/13, pdfgen now a package
 from reportlab.lib.units import inch, cm
 from reportlab.lib import colors
--- a/tests/test_pdfgen_links.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_pdfgen_links.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,10 +1,10 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #this test and associates functionality kinds donated by Ian Sparks.
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_pdfgen_links.py
 """
 Tests for internal links and destinations
 """
+__version__='''$Id:$'''
 
 #
 # Fit tests
--- a/tests/test_pdfgen_pagemodes.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_pdfgen_pagemodes.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,14 +1,10 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_pdfgen_pagemodes.py
 # full screen test
-
 """Tests for PDF page modes support in reportlab.pdfgen.
 """
-
-
+__version__='''$Id:$'''
 import os
-
 import unittest
 from tests.utils import makeSuiteForClasses, outputfile, printLocation
 
--- a/tests/test_platypus_breaking.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_platypus_breaking.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,9 +1,8 @@
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_platypus_breaking.py
 """Tests pageBreakBefore, frameBreakBefore, keepWithNext...
 """
-
+__version__='''$Id:$'''
 import sys, os, time
 from string import split, strip, join, whitespace
 from operator import truth
--- a/tests/test_platypus_general.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_platypus_general.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,6 +1,5 @@
 #Copyright ReportLab Europe Ltd. 2000-2004
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_platypus_general.py
 __version__=''' $Id$ '''
 
 #tests and documents Page Layout API
--- a/tests/test_platypus_indents.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_platypus_indents.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,8 +1,8 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_platypus_indents.py
 """Tests for context-dependent indentation
 """
+__version__='''$Id:$'''
 
 import sys, os, random
 from string import split, strip, join, whitespace
--- a/tests/test_platypus_leftright.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_platypus_leftright.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,14 +1,12 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_platypus_breaking.py
 """Tests ability to cycle through multiple page templates
 """
-
+__version__='''$Id:$'''
 import sys, os, time
 from string import split, strip, join, whitespace
 from operator import truth
 from types import StringType, ListType
-
 import unittest
 from tests.utils import makeSuiteForClasses, outputfile, printLocation
 
--- a/tests/test_platypus_pleaseturnover.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_platypus_pleaseturnover.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,11 +1,9 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_platypus_breaking.py
 """Tests pleaseTurnOver, pageBreakBefore, frameBreakBefore, keepWithNext...
 """
-
+__version__='''$Id:$'''
 import sys
-
 import unittest
 from tests.utils import makeSuiteForClasses, outputfile, printLocation
 from reportlab.platypus.flowables import Flowable, PTOContainer, KeepInFrame
--- a/tests/test_platypus_toc.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_platypus_toc.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,14 +1,12 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_platypus_toc.py
 """Tests for the Platypus TableOfContents class.
 
 Currently there is only one such test. Most such tests, like this
 one, will be generating a PDF document that needs to be eye-balled
 in order to find out if it is 'correct'.
 """
-
-
+__version__='''$Id:$'''
 import sys, os
 from os.path import join, basename, splitext
 from math import sqrt
--- a/tests/test_platypus_xref.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_platypus_xref.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,17 +1,14 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_platypus_xref.py
 """Test long documents with indexes, tables and cross-references
 """
-
+__version__='''$Id:$'''
 import sys, os, time
 from string import split, strip, join, whitespace, find
 from operator import truth
 from types import StringType, ListType
-
 import unittest
 from tests.utils import makeSuiteForClasses, outputfile, printLocation
-
 from reportlab.lib import colors
 from reportlab.lib.units import cm
 from reportlab.lib.enums import TA_LEFT, TA_RIGHT, TA_CENTER, TA_JUSTIFY
--- a/tests/test_widgetbase_tpc.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/test_widgetbase_tpc.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,16 +1,13 @@
-#Copyright ReportLab Europe Ltd. 2000-2004
+#Copyright ReportLab Europe Ltd. 2000-2008
 #see license.txt for license details
-#history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/test/test_widgetbase_tpc.py
 """
 Tests for TypedPropertyCollection class.
 """
-
+__version__='''$Id:$'''
 import os, sys, copy
 from os.path import join, basename, splitext
-
 import unittest
 from tests.utils import makeSuiteForClasses, printLocation
-
 from reportlab.graphics.widgetbase import PropHolder, TypedPropertyCollection
 from reportlab.lib.attrmap import AttrMap, AttrMapValue
 from reportlab.lib.validators import isNumber
--- a/tests/utils.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tests/utils.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,5 +1,8 @@
+#Copyright ReportLab Europe Ltd. 2000-2008
+#see license.txt for license details
 """Utilities for testing Python packages.
 """
+__version__='''$Id:$'''
 import sys, os, string, fnmatch, copy, re
 from ConfigParser import ConfigParser
 import unittest
--- a/tools/docco/graphdocpy.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tools/docco/graphdocpy.py	Wed Sep 03 17:22:41 2008 +0000
@@ -968,7 +968,7 @@
 
 def makeSuite():
     "standard test harness support - run self as separate process"
-    from reportlab.test.utils import ScriptThatMakesFileTest
+    from tests.utils import ScriptThatMakesFileTest
     return ScriptThatMakesFileTest('tools/docco',
                                    'graphdocpy.py',
                                    'reportlab.graphics.pdf')
--- a/tools/pythonpoint/pythonpoint.py	Wed Sep 03 16:18:43 2008 +0000
+++ b/tools/pythonpoint/pythonpoint.py	Wed Sep 03 17:22:41 2008 +0000
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+#Copyright ReportLab Europe Ltd. 2000-2008
+#see license.txt for license details
 """
 This is PythonPoint!
 
@@ -68,7 +70,7 @@
 - save in combined presentation/handout mode (TODO)
 - add pyRXP support (TODO)
 """
-
+__version__='''$Id:$'''
 import os, sys, imp, string, pprint, getopt, glob
 
 from reportlab import rl_config