[Zope-Checkins] CVS: Zope/lib/python/Products/TemporaryFolder - LowConflictConnection.py:1.3 TemporaryFolder.py:1.7 TemporaryStorage.py:1.10 __init__.py:1.6 patchfs.py:1.4

[Martijn Pieters]

Update of /cvs-repository/Zope/lib/python/Products/TemporaryFolder
In directory cvs.zope.org:/tmp/cvs-serv27658/TemporaryFolder

Modified Files:
	LowConflictConnection.py TemporaryFolder.py 
	TemporaryStorage.py __init__.py patchfs.py 
Log Message:
Clean up indentation and trailing whitespace.


=== Zope/lib/python/Products/TemporaryFolder/LowConflictConnection.py 1.2 => 1.3 ===
--- Zope/lib/python/Products/TemporaryFolder/LowConflictConnection.py:1.2	Wed Nov 28 10:51:08 2001
+++ Zope/lib/python/Products/TemporaryFolder/LowConflictConnection.py	Wed Aug 14 18:25:13 2002
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 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
-# 
+#
 ##############################################################################
 
 from ZODB.Connection import Connection
@@ -43,5 +43,3 @@
             d=object.__dict__
             for k,v in state.items(): d[k]=v
         object._p_serial=serial
-
-


=== Zope/lib/python/Products/TemporaryFolder/TemporaryFolder.py 1.6 => 1.7 ===
--- Zope/lib/python/Products/TemporaryFolder/TemporaryFolder.py:1.6	Mon Aug 12 17:14:15 2002
+++ Zope/lib/python/Products/TemporaryFolder/TemporaryFolder.py	Wed Aug 14 18:25:13 2002
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 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
-# 
+#
 ##############################################################################
 """
 Mounted database support
@@ -38,7 +38,7 @@
 
 ADD_TEMPORARY_FOLDER_PERM="Add Temporary Folder"
 
-    
+
 def constructTemporaryFolder(self, id, title=None, REQUEST=None):
     """ """
     ms = MountedTemporaryFolder(id, title)
@@ -58,7 +58,7 @@
     icon = 'p_/broken'
     manage_options = ({'label':'Traceback', 'action':'manage_traceback'},)
     meta_type = 'Broken Temporary Folder'
-    
+
     def __init__(self, id, title='', params=None):
         self.id = str(id)
         self.title = title
@@ -71,7 +71,7 @@
         db = DB(TemporaryStorage())
         db.klass = LowConflictConnection
         return db
-    
+
     def _getMountRoot(self, root):
         sdc = root.get('folder', None)
         if sdc is None:
@@ -79,7 +79,7 @@
             self._populate(sdc, root)
 
         return sdc
-    
+
     def mount_error_(self):
         return self._v_connect_error
 


=== Zope/lib/python/Products/TemporaryFolder/TemporaryStorage.py 1.9 => 1.10 ===
--- Zope/lib/python/Products/TemporaryFolder/TemporaryStorage.py:1.9	Sun Jun 30 14:23:15 2002
+++ Zope/lib/python/Products/TemporaryFolder/TemporaryStorage.py	Wed Aug 14 18:25:13 2002
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 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
-# 
+#
 ##############################################################################
 
 """
@@ -82,12 +82,12 @@
                     del self._conflict_cache[k]
             self._last_cache_gc = now
         self._tmp = []
-        
+
     def close(self):
         """
         Close the storage
         """
-    
+
     def load(self, oid, version):
         self._lock_acquire()
         try:
@@ -112,7 +112,7 @@
                 return data[0] # data here is actually (data, t)
         finally:
             self._lock_release()
-            
+
     def store(self, oid, serial, data, version, transaction):
         if transaction is not self._transaction:
             raise POSException.StorageTransactionError(self, transaction)
@@ -217,7 +217,7 @@
                 self._takeOutGarbage(oid)
 
         self._tmp = []
-        
+
     def _takeOutGarbage(self, oid):
         # take out the garbage.
         referenceCount=self._referenceCount
@@ -246,7 +246,7 @@
                 referenceCount[roid] = rc - 1
         try: del self._oreferences[oid]
         except: pass
-                
+
     def pack(self, t, referencesf):
         self._lock_acquire()
         try:
@@ -268,9 +268,3 @@
                     self._takeOutGarbage(oid)
         finally:
             self._lock_release()
-
-
-    
-
-    
-


=== Zope/lib/python/Products/TemporaryFolder/__init__.py 1.5 => 1.6 ===
--- Zope/lib/python/Products/TemporaryFolder/__init__.py:1.5	Fri Jan 11 09:53:38 2002
+++ Zope/lib/python/Products/TemporaryFolder/__init__.py	Wed Aug 14 18:25:13 2002
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 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
-# 
+#
 ##############################################################################
 """
 Temporary Folder initialization routines


=== Zope/lib/python/Products/TemporaryFolder/patchfs.py 1.3 => 1.4 ===
--- Zope/lib/python/Products/TemporaryFolder/patchfs.py:1.3	Wed Nov 28 11:09:08 2001
+++ Zope/lib/python/Products/TemporaryFolder/patchfs.py	Wed Aug 14 18:25:13 2002
@@ -1,7 +1,7 @@
 # Utility program to patch Data.fs.in to include a temporary folder, browser
 # id manager, and session data manager
 ############################################################################
-# 
+#
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -18,7 +18,7 @@
 from ZODB import FileStorage, DB
 import Products.Sessions.BrowserIdManager
 import Products.Sessions.SessionDataManager
-import Products.TemporaryFolder.TemporaryFolder 
+import Products.TemporaryFolder.TemporaryFolder
 import os.path
 import sys