--- a/reportlab/graphics/shapes.py Tue Mar 12 15:16:24 2002 +0000
+++ b/reportlab/graphics/shapes.py Tue Mar 12 15:18:03 2002 +0000
@@ -1,7 +1,7 @@
#copyright ReportLab Inc. 2001
#see license.txt for license details
#history http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/reportlab/graphics/shapes.py?cvsroot=reportlab
-#$Header: /tmp/reportlab/reportlab/graphics/shapes.py,v 1.70 2002/01/17 10:53:21 rgbecker Exp $
+#$Header: /tmp/reportlab/reportlab/graphics/shapes.py,v 1.71 2002/03/12 15:18:02 rgbecker Exp $
# core of the graphics library - defines Drawing and Shapes
"""
"""
@@ -12,7 +12,7 @@
from pprint import pprint
from reportlab.platypus import Flowable
-from reportlab.rl_config import shapeChecking, _verbose
+from reportlab.rl_config import shapeChecking, verbose
from reportlab.lib import logger
from reportlab.lib import colors
from reportlab.lib.validators import *
@@ -558,7 +558,7 @@
if string.lower(plotMode[1][1:]) in ['pdf','ps','eps','gif','png','jpg','jpeg','tiff','tif','py']:
fnroot = plotMode[0]
- plotMode, verbose = formats or getattr(self,'formats',['pdf']), (verbose is not None and (verbose,) or (getattr(self,'verbose',_verbose),))[0]
+ plotMode, verbose = formats or getattr(self,'formats',['pdf']), (verbose is not None and (verbose,) or (getattr(self,'verbose',verbose),))[0]
_saved = logger.warnOnce.enabled, logger.infoOnce.enabled
logger.warnOnce.enabled = logger.infoOnce.enabled = verbose
if 'pdf' in plotMode:
--- a/reportlab/pdfbase/pdfutils.py Tue Mar 12 15:16:24 2002 +0000
+++ b/reportlab/pdfbase/pdfutils.py Tue Mar 12 15:18:03 2002 +0000
@@ -1,8 +1,8 @@
#copyright ReportLab Inc. 2000
#see license.txt for license details
#history http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/reportlab/pdfbase/pdfutils.py?cvsroot=reportlab
-#$Header: /tmp/reportlab/reportlab/pdfbase/pdfutils.py,v 1.28 2001/11/13 18:37:17 aaron_watters Exp $
-__version__=''' $Id: pdfutils.py,v 1.28 2001/11/13 18:37:17 aaron_watters Exp $ '''
+#$Header: /tmp/reportlab/reportlab/pdfbase/pdfutils.py,v 1.29 2002/03/12 15:18:03 rgbecker Exp $
+__version__=''' $Id: pdfutils.py,v 1.29 2002/03/12 15:18:03 rgbecker Exp $ '''
__doc__=''
# pdfutils.py - everything to do with images, streams,
# compression, and some constants
@@ -63,7 +63,7 @@
f = open(cachedname,'wb')
f.write(join(code, LINEEND)+LINEEND)
f.close()
- if rl_config._verbose:
+ if rl_config.verbose:
print 'cached image as %s' % cachedname
@@ -84,7 +84,7 @@
for filename in filelist:
if cachedImageExists(filename):
- if rl_config._verbose:
+ if rl_config.verbose:
print 'cached version of %s already exists' % filename
else:
cacheImageFile(filename)
--- a/reportlab/platypus/doctemplate.py Tue Mar 12 15:16:24 2002 +0000
+++ b/reportlab/platypus/doctemplate.py Tue Mar 12 15:18:03 2002 +0000
@@ -1,9 +1,9 @@
#copyright ReportLab Inc. 2000
#see license.txt for license details
#history http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/reportlab/platypus/doctemplate.py?cvsroot=reportlab
-#$Header: /tmp/reportlab/reportlab/platypus/doctemplate.py,v 1.51 2002/02/13 16:44:29 rgbecker Exp $
+#$Header: /tmp/reportlab/reportlab/platypus/doctemplate.py,v 1.52 2002/03/12 15:18:03 rgbecker Exp $
-__version__=''' $Id: doctemplate.py,v 1.51 2002/02/13 16:44:29 rgbecker Exp $ '''
+__version__=''' $Id: doctemplate.py,v 1.52 2002/03/12 15:18:03 rgbecker Exp $ '''
__doc__="""
This module contains the core structure of platypus.
@@ -32,7 +32,7 @@
from reportlab.platypus.flowables import *
from reportlab.platypus.paragraph import Paragraph
from reportlab.platypus.frames import Frame
-from reportlab.rl_config import defaultPageSize, _verbose
+from reportlab.rl_config import defaultPageSize, verbose
import reportlab.lib.sequencer
from types import *
@@ -582,7 +582,7 @@
def pageRef(self, label):
"""hook to register a page number"""
- if _verbose: print "pageRef called with label '%s' on page %d" % (
+ if verbose: print "pageRef called with label '%s' on page %d" % (
label, self.page)
self._pageRefs[label] = self.page
@@ -603,7 +603,7 @@
passes = 0
while 1:
passes = passes + 1
- if _verbose: print 'building pass '+str(passes) + '...',
+ if verbose: print 'building pass '+str(passes) + '...',
for fl in self._indexingFlowables:
fl.beforeBuild()
@@ -635,7 +635,7 @@
if passes > maxPasses:
raise IndexError, "Index entries not resolved after %d passes" % maxPasses
- if _verbose: print 'saved'
+ if verbose: print 'saved'
#these are pure virtuals override in derived classes
#NB these get called at suitable places by the base class
--- a/reportlab/rl_config.py Tue Mar 12 15:16:24 2002 +0000
+++ b/reportlab/rl_config.py Tue Mar 12 15:18:03 2002 +0000
@@ -1,7 +1,7 @@
#copyright ReportLab Inc. 2000-2001
#see license.txt for license details
#history http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/reportlab/rl_config.py?cvsroot=reportlab
-#$Header: /tmp/reportlab/reportlab/rl_config.py,v 1.28 2001/11/01 20:53:27 johnprecedo Exp $
+#$Header: /tmp/reportlab/reportlab/rl_config.py,v 1.29 2002/03/12 15:18:02 rgbecker Exp $
allowTableBoundsErrors = 1 # set to 0 to die on too large elements in tables in debug (recommend 1 for production use)
shapeChecking = 1
@@ -12,7 +12,7 @@
PIL_WARNINGS = 1 #set to zero to remove those annoying warnings
ZLIB_WARNINGS = 1
warnOnMissingFontGlyphs = 0 #if 1, warns of each missing glyph
-_verbose = 0
+verbose = 0
showBoundary = 0 # turns on and off boundary behaviour in Drawing
# places to look for T1Font information
@@ -54,7 +54,7 @@
else we use the given default'''
V = ('T1SearchPath','CMapSearchPath','shapeChecking', 'defaultEncoding', 'pageCompression',
'defaultPageSize', 'defaultImageCaching', 'PIL_WARNINGS',
- 'ZLIB_WARNINGS', 'warnOnMissingFontGlyphs', '_verbose',
+ 'ZLIB_WARNINGS', 'warnOnMissingFontGlyphs', 'verbose',
)
if _SAVED=={}:
--- a/reportlab/tools/docco/graphdocpy.py Tue Mar 12 15:16:24 2002 +0000
+++ b/reportlab/tools/docco/graphdocpy.py Tue Mar 12 15:18:03 2002 +0000
@@ -2,7 +2,7 @@
#copyright ReportLab Inc. 2000-2001
#see license.txt for license details
#history http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/reportlab/lib/graphdocpy.py?cvsroot=reportlab
-#$Header: /tmp/reportlab/reportlab/tools/docco/graphdocpy.py,v 1.13 2002/03/02 14:05:51 rgbecker Exp $
+#$Header: /tmp/reportlab/reportlab/tools/docco/graphdocpy.py,v 1.14 2002/03/12 15:18:03 rgbecker Exp $
"""Generate documentation for reportlab.graphics classes.
@@ -57,7 +57,7 @@
from reportlab.graphics import shapes
from reportlab.graphics import renderPDF
-VERBOSE = rl_config._verbose
+VERBOSE = rl_config.verbose
VERIFY = 1
_abstractclasserr_re = re.compile(r'^\s*abstract\s*class\s*(\w+)\s*instantiated',re.I)
--- a/reportlab/tools/pythonpoint/pythonpoint.py Tue Mar 12 15:16:24 2002 +0000
+++ b/reportlab/tools/pythonpoint/pythonpoint.py Tue Mar 12 15:18:03 2002 +0000
@@ -320,7 +320,7 @@
#assume landscape
self.pageWidth = rl_config.defaultPageSize[1]
self.pageHeight = rl_config.defaultPageSize[0]
- self.verbose = rl_config._verbose
+ self.verbose = rl_config.verbose
def saveAsPresentation(self):
@@ -958,7 +958,7 @@
'handout':0,
'help':0,
'notes':0,
- 'verbose':rl_config._verbose,
+ 'verbose':rl_config.verbose,
'silent':0,
'outDir': None}
--- a/utils/daily.py Tue Mar 12 15:16:24 2002 +0000
+++ b/utils/daily.py Tue Mar 12 15:18:03 2002 +0000
@@ -2,8 +2,8 @@
#copyright ReportLab Inc. 2000
#see license.txt for license details
#history http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/utils/daily.py?cvsroot=reportlab
-#$Header: /tmp/reportlab/utils/daily.py,v 1.52 2001/12/12 10:39:56 rgbecker Exp $
-__version__=''' $Id: daily.py,v 1.52 2001/12/12 10:39:56 rgbecker Exp $ '''
+#$Header: /tmp/reportlab/utils/daily.py,v 1.53 2002/03/12 15:18:03 rgbecker Exp $
+__version__=''' $Id: daily.py,v 1.53 2002/03/12 15:18:03 rgbecker Exp $ '''
'''
script for creating daily cvs archive dump
'''
@@ -18,7 +18,7 @@
py2pdf=0 #1 if doing a special py2pdf zip/tgz
#USER=os.environ['USER']
USER='anonymous'
-verbose=os.environ.get('RL__verbose',0)
+verbose=os.environ.get('RL_verbose',0)
sys.stderr = sys.stdout
def get_path():
@@ -146,9 +146,10 @@
CVS_remove(dst)
elif release:
dst = os.path.join(d,"reportlab","docs")
- for f in ('userguide.pdf', 'graphguide.pdf' 'reference.pdf', 'graphics_reference.pdf'):
- f = os.path.join(htmldir,f)
- if os.path.isfile(f): copy(f,dst)
+ for f in ('userguide.pdf', 'graphguide.pdf', 'reference.pdf', 'graphics_reference.pdf'):
+ src = os.path.join(htmldir,f)
+ if os.path.isfile(src): copy(src,dst)
+ else: print "Cannot copy %s to %s" % (src,htmldir)
def do_zip(d):
'create .tgz and .zip file archives of d/reportlab'