legends.py, stdparser.py: isSeqType-->isSeq py33
authorrobin
Tue, 19 Nov 2013 12:21:04 +0000
branchpy33
changeset 3793 cc3f9cc828f7
parent 3792 7a74dc41cc2c
child 3794 398ea04239b5
legends.py, stdparser.py: isSeqType-->isSeq
src/reportlab/graphics/charts/legends.py
tools/pythonpoint/stdparser.py
--- a/src/reportlab/graphics/charts/legends.py	Tue Nov 19 12:14:09 2013 +0000
+++ b/src/reportlab/graphics/charts/legends.py	Tue Nov 19 12:21:04 2013 +0000
@@ -17,7 +17,7 @@
 from reportlab.graphics.shapes import Drawing, Group, String, Rect, Line, STATE_DEFAULTS
 from reportlab.graphics.charts.areas import PlotArea
 from reportlab.graphics.widgets.markers import uSymbol2Symbol, isSymbol
-from reportlab.lib.utils import isSeqType, find_locals
+from reportlab.lib.utils import isSeq, find_locals
 from reportlab.graphics.shapes import _baseGFontName
 from functools import reduce
 
@@ -40,20 +40,20 @@
         return str(s)
 
 def _getStr(s):
-    if isSeqType(s):
+    if isSeq(s):
         return list(map(_getStr,s))
     else:
         return _objStr(s)
 
 def _getLines(s):
-    if isSeqType(s):
+    if isSeq(s):
         return tuple([(x or '').split('\n') for x in s])
     else:
         return (s or '').split('\n')
 
 def _getLineCount(s):
     T = _getLines(s)
-    if isSeqType(s):
+    if isSeq(s):
         return max([len(x) for x in T])
     else:
         return len(T)
@@ -61,7 +61,7 @@
 def _getWidths(i,s, fontName, fontSize, subCols):
     S = []
     aS = S.append
-    if isSeqType(s):
+    if isSeq(s):
         for j,t in enumerate(s):
             sc = subCols[j,i]
             fN = getattr(sc,'fontName',fontName)
@@ -402,7 +402,7 @@
                 xn = thisx
             else:
                 raise ValueError("bad alignment")
-            if not isSeqType(name):
+            if not isSeq(name):
                 T = [T]
             yd = y
             for k,lines in enumerate(T):
--- a/tools/pythonpoint/stdparser.py	Tue Nov 19 12:14:09 2013 +0000
+++ b/tools/pythonpoint/stdparser.py	Tue Nov 19 12:21:04 2013 +0000
@@ -8,7 +8,7 @@
 """
 
 import string, imp, sys, os, copy
-from reportlab.lib.utils import isSeqType
+from reportlab.lib.utils import isSeq
 from reportlab.lib import xmllib
 from reportlab.lib import colors
 from reportlab.lib.enums import TA_LEFT, TA_RIGHT, TA_CENTER, TA_JUSTIFY
@@ -325,7 +325,7 @@
         #makes it the current style sheet.
         path = self._arg('stylesheet',args,'path')
         if path=='None': path = []
-        if not isSeqType(path): path = [path]
+        if not isSeq(path): path = [path]
         path.append('styles')
         path.append(os.getcwd())
         modulename = self._arg('stylesheet', args, 'module')