--- a/reportlab/lib/colors.py Tue Jun 13 20:03:30 2000 +0000
+++ b/reportlab/lib/colors.py Wed Jun 14 21:17:30 2000 +0000
@@ -32,9 +32,12 @@
#
###############################################################################
# $Log: colors.py,v $
+# Revision 1.9 2000/06/14 21:17:30 andy_robinson
+# Some relative imports fixed
+#
# Revision 1.8 2000/05/26 09:43:44 rgbecker
# stringToColor-->toColor
-#
+#
# Revision 1.7 2000/04/06 18:10:35 rgbecker
# Fixed type in stringToColor
#
@@ -53,15 +56,15 @@
# Revision 1.2 2000/03/08 13:06:39 andy_robinson
# Moved inch and cm definitions to reportlab.lib.units and amended all demos
#
-__version__=''' $Id: colors.py,v 1.8 2000/05/26 09:43:44 rgbecker Exp $ '''
+__version__=''' $Id: colors.py,v 1.9 2000/06/14 21:17:30 andy_robinson Exp $ '''
import string
import math
from types import StringType, ListType, TupleType
class Color:
- "This class is used to represent color. Components red, green, blue \
- are in the range 0 (dark) to 1 (full intensity)."
+ """This class is used to represent color. Components red, green, blue
+ are in the range 0 (dark) to 1 (full intensity)."""
def __init__(self, red=0, green=0, blue=0):
"Initialize with red, green, blue in range [0-1]."
@@ -94,7 +97,7 @@
return (r,g,b)
def HexColor(val):
- """This class converts a hex string, or an actual integer number,
+ """This function converts a hex string, or an actual integer number,
into the corresponding color. E.g., in "AABBCC" or 0xAABBCC,
AA is the red, BB is the green, and CC is the blue (00-FF).
--- a/reportlab/lib/pagesizes.py Tue Jun 13 20:03:30 2000 +0000
+++ b/reportlab/lib/pagesizes.py Wed Jun 14 21:17:30 2000 +0000
@@ -33,10 +33,13 @@
#
###############################################################################
# $Log: pagesizes.py,v $
+# Revision 1.4 2000/06/14 21:17:30 andy_robinson
+# Some relative imports fixed
+#
# Revision 1.3 2000/04/26 11:13:28 andy_robinson
# Fixed some broken pagesizes and added a
# landscape() function.
-#
+#
# Revision 1.2 2000/03/08 13:40:49 rgbecker
# Added DEFAULT_PAGE_SIZE at end
#
@@ -47,9 +50,9 @@
"""This module defines a few common page sizes in points (1/72 inch).
To be expanded to include things like label sizes, envelope windows
etc."""
-__version__=''' $Id: pagesizes.py,v 1.3 2000/04/26 11:13:28 andy_robinson Exp $ '''
+__version__=''' $Id: pagesizes.py,v 1.4 2000/06/14 21:17:30 andy_robinson Exp $ '''
-from units import cm, inch
+from reportlab.lib.units import cm, inch
_W, _H = (21*cm, 29.7*cm)