Removed state names hacks. Hooray!!

lib/python/OFS/DTMLDocument.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """DTML Document objects."""
 
-__version__='$Revision: 1.25 $'[11:-2]
+__version__='$Revision: 1.26 $'[11:-2]
 from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
 from ZPublisher.Converters import type_converters
 from Globals import HTML, HTMLFile, MessageDialog
@@ -118,19 +118,6 @@ class DTMLDocument(DTMLMethod, PropertyManager):
         ('Change DTML Documents',   ('manage_edit', 'manage_upload', 'PUT')),
     )
 
-    def __getstate__(self):
-        state={}
-        props={}
-        for id in self.propertyIds():
-            props[id]=1
-        prop_id=props.has_key
-        state_name=self._state_name
-        for k, v in self.__dict__.items():
-            if state_name(k) or prop_id(k) or k[-11:]=='_Permission' \
-               or k[-9:]=="__roles__" or k=='_properties':
-                state[k]=v
-        return state
-
     def manage_edit(self,data,title,SUBMIT='Change',dtpref_cols='50',
                     dtpref_rows='20',REQUEST=None):
         """

lib/python/OFS/DTMLMethod.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """DTML Method objects."""
 
-__version__='$Revision: 1.25 $'[11:-2]
+__version__='$Revision: 1.26 $'[11:-2]
 
 from Globals import HTML, HTMLFile, MessageDialog
 from string import join,split,strip,rfind,atoi,lower
@@ -128,18 +128,6 @@ class DTMLMethod(cDocument, HTML, Acquisition.Implicit, RoleManager,
     ('View', ('__call__', '')),
     ('FTP access', ('manage_FTPstat','manage_FTPget','manage_FTPlist')),
     )
-    _state_name={'raw':1, 'globals':1, '__name__':1, '_vars':1,
-                 '_proxy_roles':1, 'title':1,
-                 '__ac_local_roles__':1}.has_key
-
-    def __getstate__(self):
-        r={}
-        state_name=self._state_name
-        for k, v in self.__dict__.items():
-            if state_name(k) or k[-11:]=='_Permission' or k[-9:]=="__roles__":
-                r[k]=v
-        return r
-   
 
     def __call__(self, client=None, REQUEST={}, RESPONSE=None, **kw):
         """Render the document given a client object, REQUEST mapping,