Changeset 12087

Timestamp:

28 Nov 2014, 16:17:38 (10 years ago)

Author:

Henrik Bettermann

Message:

Rename dictionaries in order to not confuse all the dicts.

Rename UserExporter?.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• customers/customer.py (modified) (1 diff)
• customers/utils.py (modified) (1 diff)
• documents/document.py (modified) (1 diff)
• documents/utils.py (modified) (1 diff)
• userscontainer.py (modified) (2 diffs)
• userscontainer.txt (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/customer.py

@@ -124 +124 @@
     def translated_state(self):
         try:
-            TRANSLATED_STATES = getUtility(ICustomersUtils).TRANSLATED_STATES
+            TRANSLATED_STATES = getUtility(
+                ICustomersUtils).TRANSLATED_CUSTOMER_STATES
             ts = TRANSLATED_STATES[self.state]
             return ts

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/utils.py

@@ -281 +281 @@
     SKIP_UPLOAD_VIEWLETS = ()
 
-    TRANSLATED_STATES = {
+    TRANSLATED_CUSTOMER_STATES = {
         CREATED: _('created'),
         STARTED: _('started'),

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/document.py

@@ -64 +64 @@
     def translated_state(self):
         try:
-            TRANSLATED_STATES = getUtility(IDocumentsUtils).TRANSLATED_STATES
+            TRANSLATED_STATES = getUtility(
+                IDocumentsUtils).TRANSLATED_DOCUMENT_STATES
             return TRANSLATED_STATES[self.state]
         except KeyError:

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/utils.py

@@ -39 +39 @@
     DOCMANAGE_STATES = (CREATED,)
 
-    TRANSLATED_STATES = {
+    TRANSLATED_DOCUMENT_STATES = {
         CREATED: _('created'),
         SUBMITTED: _('submitted for verification'),

main/waeup.ikoba/trunk/src/waeup/ikoba/userscontainer.py

@@ -66 +66 @@
 
 
-class UsersExporter(grok.GlobalUtility, ExporterBase):
+class UserExporter(grok.GlobalUtility, ExporterBase):
     """Exporter for user accounts.
     """
@@ -98 +98 @@
                 value[role] = object_list
         return super(
-            UsersExporter, self).mangle_value(
+            UserExporter, self).mangle_value(
             value, name, context=context)
 

main/waeup.ikoba/trunk/src/waeup/ikoba/userscontainer.txt

@@ -50 +50 @@
 We can export user accounts:
 
-    >>> from waeup.ikoba.userscontainer import UsersExporter
+    >>> from waeup.ikoba.userscontainer import UserExporter
     >>> import os
     >>> import tempfile
     >>> workdir = tempfile.mkdtemp()
     >>> outfile = os.path.join(workdir, 'myoutput.csv')
-    >>> exporter = UsersExporter()
+    >>> exporter = UserExporter()
     >>> site = {'users':myusers}
     >>> exporter.export_all(site, outfile)