[Checkins] SVN: zc.catalogqueue/trunk/s remove trailing whitespace.

[Satchidanand Haridas]

Log message for revision 105374:
  remove trailing whitespace.
  
  

Changed:
  U   zc.catalogqueue/trunk/setup.py
  U   zc.catalogqueue/trunk/src/zc/catalogqueue/tests/test_CatalogEventQueue.py

-=-
Modified: zc.catalogqueue/trunk/setup.py
===================================================================
--- zc.catalogqueue/trunk/setup.py	2009-10-29 18:12:52 UTC (rev 105373)
+++ zc.catalogqueue/trunk/setup.py	2009-10-29 18:28:12 UTC (rev 105374)
@@ -44,7 +44,7 @@
     description = '',
     long_description=long_description,
     license = 'ZPL 2.1',
-    
+
     packages = find_packages('src'),
     namespace_packages = ['zc'],
     package_dir = {'': 'src'},

Modified: zc.catalogqueue/trunk/src/zc/catalogqueue/tests/test_CatalogEventQueue.py
===================================================================
--- zc.catalogqueue/trunk/src/zc/catalogqueue/tests/test_CatalogEventQueue.py	2009-10-29 18:12:52 UTC (rev 105373)
+++ zc.catalogqueue/trunk/src/zc/catalogqueue/tests/test_CatalogEventQueue.py	2009-10-29 18:28:12 UTC (rev 105374)
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2002-2006 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 
 import os
@@ -26,7 +26,7 @@
 from zc.catalogqueue.CatalogEventQueue import REMOVED
 from zc.catalogqueue.CatalogEventQueue import SAFE_POLICY
 from zc.catalogqueue.CatalogEventQueue import ALTERNATIVE_POLICY
-from ZODB.POSException import ConflictError 
+from ZODB.POSException import ConflictError
 
 
 class QueueConflictTests(unittest.TestCase):
@@ -39,8 +39,8 @@
 
         self.assertEquals(self.queue._conflict_policy, ALTERNATIVE_POLICY)
         self.assertEquals(self.queue2._conflict_policy, ALTERNATIVE_POLICY)
- 
 
+
     def _insane_update(self, queue, uid, etype):
         # Queue update method that allows insane state changes, needed
         # to provoke pathological queue states
@@ -151,7 +151,7 @@
         # commit an ADDED event while the conflict resolution policy is
         # NOT the SAFE_POLICY, we won't get a conflict.
         self._setAlternativePolicy()
-        
+
         self.queue.update('/f0', ADDED)
         self.queue.update('/f0', CHANGED)
         self.queue._p_jar.transaction_manager.commit()
@@ -182,7 +182,7 @@
         # commit an ADDED event while the conflict resolution policy is
         # NOT the SAFE_POLICY, we won't get a conflict.
         self._setAlternativePolicy()
-        
+
         self.queue.update('/f0', ADDED)
         self.queue.update('/f0', CHANGED)
         self.queue._p_jar.transaction_manager.commit()
@@ -228,12 +228,12 @@
 
     def test_resolved_new_old_current_all_different(self):
         # If the events we get from the current, new and old states are
-        # all different and the SAFE_POLICY conflict resolution policy is 
+        # all different and the SAFE_POLICY conflict resolution policy is
         # not enforced, the conflict resolves without bloodshed.
         # This test relies on the fact that no OLD state is de-facto treated
         # as a state.
         self._setAlternativePolicy()
- 
+
         self.queue.update('/f0', ADDED)
         self.queue.update('/f0', CHANGED)
         self.queue._p_jar.transaction_manager.commit()
@@ -242,8 +242,8 @@
         self._insane_update(self.queue2, '/f0', REMOVED)
         self.queue2._p_jar.transaction_manager.commit()
 
-        # In this scenario (the incoming new state has a REMOVED event), 
-        # the new state is disregarded and the old state is used. We are 
+        # In this scenario (the incoming new state has a REMOVED event),
+        # the new state is disregarded and the old state is used. We are
         # left with a CHANGED_ADDED event. (see queue.update method; ADDED
         # plus CHANGED results in CHANGED_ADDED)
         self.queue._p_jar.sync()
@@ -280,10 +280,10 @@
 
     def test_resolved_new_old_current_all_different_2(self):
         # If the events we get from the current, new and old states are
-        # all different and the SAFE_POLICY conflict resolution policy is 
+        # all different and the SAFE_POLICY conflict resolution policy is
         # not enforced, the conflict resolves without bloodshed.
         self._setAlternativePolicy()
- 
+
         self.queue.update('/f0', ADDED)
         self.queue.update('/f0', CHANGED)
         self.queue._p_jar.transaction_manager.commit()
@@ -299,7 +299,7 @@
         self._insane_update(self.queue2, '/f0', REMOVED)
         self.queue2._p_jar.transaction_manager.commit()
 
-        # In this scenario (the incoming new state has a REMOVED event), 
+        # In this scenario (the incoming new state has a REMOVED event),
         # we will take the new state to resolve the conflict, because its
         # generation number is higher then the oldstate and current state.
         self.queue._p_jar.sync()