plone.api/fix_tests: readability

Repository: plone.api
Branch: refs/heads/fix_tests
Date: 2017-08-01T12:21:14+02:00
Author: Alexander Loechel (loechel) <[email protected]>
Commit: https://github.com/plone/plone.api/commit/9db58bf862ed7ae7d4d39d3a3773e54cc24c1399

readability

Files changed:
M buildout.cfg
M src/plone/api/tests/base.py
M src/plone/api/tests/test_content.py

diff --git a/buildout.cfg b/buildout.cfg
index 039a3f9..84bb9ec 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -4,8 +4,6 @@ package-name = plone.api
 package-extras = [test]
 test-eggs =
     plone.api
-#    Pillow
-#    plone.app.contenttypes
 
 parts +=
     omelette
diff --git a/src/plone/api/tests/base.py b/src/plone/api/tests/base.py
index 0e0f4a1..1046a30 100644
--- a/src/plone/api/tests/base.py
+++ b/src/plone/api/tests/base.py
@@ -23,7 +23,7 @@
 
 class PloneApiLayer(PloneSandboxLayer):
 
-    defaultBases = (PLONE_FIXTURE,)
+    defaultBases = (PLONE_FIXTURE, )
 
     def setUpZope(self, app, configurationContext):
         """Prepare Zope instance by loading appropriate ZCMLs."""
diff --git a/src/plone/api/tests/test_content.py b/src/plone/api/tests/test_content.py
index 7de9dc2..41697ff 100644
--- a/src/plone/api/tests/test_content.py
+++ b/src/plone/api/tests/test_content.py
@@ -179,12 +179,12 @@ def test_create_constraints(self):
         ENABLED = 1
         if getattr(aq_base(folder), 'setConstrainTypesMode', None):  # AT
             folder.setConstrainTypesMode(ENABLED)
-            folder.setLocallyAllowedTypes(('News Item',))
+            folder.setLocallyAllowedTypes(('News Item', ))
         else:  # DX
             from Products.CMFPlone.interfaces import ISelectableConstrainTypes
             constraints = ISelectableConstrainTypes(folder)
             constraints.setConstrainTypesMode(ENABLED)
-            constraints.setLocallyAllowedTypes(('News Item',))
+            constraints.setLocallyAllowedTypes(('News Item', ))
 
         with self.assertRaises(InvalidParameterError):
             api.content.create(
@@ -496,9 +496,9 @@ def test_rename(self):
         def recordEvent(event):
             firedEvents.append(event.__class__)
 
-        sm.registerHandler(recordEvent, (IObjectWillBeMovedEvent,))
-        sm.registerHandler(recordEvent, (IObjectMovedEvent,))
-        sm.registerHandler(recordEvent, (IObjectModifiedEvent,))
+        sm.registerHandler(recordEvent, (IObjectWillBeMovedEvent, ))
+        sm.registerHandler(recordEvent, (IObjectMovedEvent, ))
+        sm.registerHandler(recordEvent, (IObjectModifiedEvent, ))
 
         # Rename contact
         nucontact = api.content.rename(obj=self.contact, new_id='nu-contact')
@@ -514,9 +514,9 @@ def recordEvent(event):
                 ContainerModifiedEvent,
             ],
         )
-        sm.unregisterHandler(recordEvent, (IObjectWillBeMovedEvent,))
-        sm.unregisterHandler(recordEvent, (IObjectMovedEvent,))
-        sm.unregisterHandler(recordEvent, (IObjectModifiedEvent,))
+        sm.unregisterHandler(recordEvent, (IObjectWillBeMovedEvent, ))
+        sm.unregisterHandler(recordEvent, (IObjectMovedEvent, ))
+        sm.unregisterHandler(recordEvent, (IObjectModifiedEvent, ))
 
         # Test with safe_id option when moving content
         api.content.create(
@@ -660,14 +660,23 @@ def test_copy(self):
 
         # Create a second folder named bargains
         bargains = api.content.create(
-            type='Folder', id='bargains', container=self.portal,
+            type='Folder',
+            id='bargains',
+            container=self.portal,
         )
 
         # Create a bargain inside the bargains folder with the id="item"
         bargain = api.content.create(
-            container=bargains, type='Document', id='item',
+            type='Document',
+            id='item',
+            container=bargains,
+        )
+        api.content.copy(
+            source=item,
+            target=bargains,
+            id='item',
+            safe_id=True,
         )
-        api.content.copy(source=item, target=bargains, id='item', safe_id=True)
 
         assert container['bargains']['item-1']
         assert container['bargains']['item']
@@ -1002,7 +1011,7 @@ def test_transition(self):
         self.maxDiff = None  # to see assert diff
         self.assertMultiLineEqual(
             str(cm.exception),
-            "Invalid transition 'foo'.\n"
+            'Invalid transition "foo".\n'
             'Valid transitions are:\n'
             'reject\n'
             'retract',



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot