appy.pod: improved styles mapping system: one may now express things like: 'p[text-align=center]':'StandardCentered' (ie, map an HTML tag having some CSS attributes to a specific ODT style). See verbose docstrings in styles_manager.py.

gen/__init__.py

@@ -5,13 +5,12 @@ from appy import Object
 from appy.gen.layout import Table
 from appy.gen.layout import defaultFieldLayouts
 from appy.gen.po import PoMessage
-from appy.gen.utils import sequenceTypes, GroupDescr, Keywords, getClassName, \
-                           SomeObjects
+from appy.gen.utils import GroupDescr, Keywords, getClassName, SomeObjects
 import appy.pod
 from appy.pod.renderer import Renderer
 from appy.shared.data import countries
 from appy.shared.utils import Traceback, getOsTempFolder, formatNumber, \
-                              FileWrapper
+                              FileWrapper, sequenceTypes
 
 # Default Appy permissions -----------------------------------------------------
 r, w, d = ('read', 'write', 'delete')

gen/mixins/ToolMixin.py

@@ -1,11 +1,11 @@
 # ------------------------------------------------------------------------------
 import os, os.path, sys, re, time, random, types, base64, urllib
 from appy.shared import mimeTypes
-from appy.shared.utils import getOsTempFolder
+from appy.shared.utils import getOsTempFolder, sequenceTypes
 from appy.shared.data import languages
 import appy.gen
 from appy.gen import Type, Search, Selection
-from appy.gen.utils import SomeObjects, sequenceTypes, getClassName
+from appy.gen.utils import SomeObjects, getClassName
 from appy.gen.mixins import BaseMixin
 from appy.gen.wrappers import AbstractWrapper
 from appy.gen.descriptors import ClassDescriptor

gen/mixins/__init__.py

@@ -9,6 +9,7 @@ import appy.gen as gen
 from appy.gen.utils import *
 from appy.gen.layout import Table, defaultPageLayouts
 from appy.gen.descriptors import WorkflowDescriptor, ClassDescriptor
+from appy.shared.utils import sequenceTypes
 
 # ------------------------------------------------------------------------------
 class BaseMixin:

gen/notifier.py

@@ -33,9 +33,9 @@ def convertRolesToEmails(users, portal):
 SENDMAIL_ERROR = 'Error while sending mail: %s.'
 ENCODING_ERROR = 'Encoding error while sending mail: %s.'
 
-from appy.gen.utils import sequenceTypes
-from appy.gen.descriptors import WorkflowDescriptor
 import socket
+from appy.shared.utils import sequenceTypes
+from appy.gen.descriptors import WorkflowDescriptor
 
 def sendMail(obj, transition, transitionName, workflow):
     '''Sends mail about p_transition that has been triggered on p_obj that is

gen/utils.py

@@ -1,7 +1,5 @@
 # ------------------------------------------------------------------------------
 import re, os, os.path
-import appy.pod
-sequenceTypes = (list, tuple)
 
 # Function for creating a Zope object ------------------------------------------
 def createObject(folder, id, className, appName, wf=True):

gen/wrappers/__init__.py

@@ -5,8 +5,9 @@
 import os, os.path, mimetypes
 import appy.pod
 from appy.gen import Type, Search, Ref, String
-from appy.gen.utils import sequenceTypes, createObject
-from appy.shared.utils import getOsTempFolder, executeCommand, normalizeString
+from appy.gen.utils import createObject
+from appy.shared.utils import getOsTempFolder, executeCommand, \
+                              normalizeString, sequenceTypes
 from appy.shared.xml_parser import XmlMarshaller
 from appy.shared.csv_parser import CsvMarshaller