Commit 0370fe32 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

code cleanup.

parent 139911ef
...@@ -70,8 +70,6 @@ except ImportError: ...@@ -70,8 +70,6 @@ except ImportError:
pass pass
from AccessControl import getSecurityManager
from Products.ERP5Type import Permissions
from DateTime import DateTime from DateTime import DateTime
from random import randint from random import randint
...@@ -186,7 +184,7 @@ class FolderMixIn(ExtensionClass.Base): ...@@ -186,7 +184,7 @@ class FolderMixIn(ExtensionClass.Base):
Generate id base on date, useful for HBTreeFolder Generate id base on date, useful for HBTreeFolder
We also append random id We also append random id
""" """
current_date = str(DateTime().Date()).replace("/", "") current_date = DateTime().strftime('%Y%m%d')
my_id = self._generateRandomId() my_id = self._generateRandomId()
return "%s-%s" %(current_date, my_id) return "%s-%s" %(current_date, my_id)
...@@ -1200,7 +1198,6 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn): ...@@ -1200,7 +1198,6 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn):
if isinstance(to_class, type('')): if isinstance(to_class, type('')):
to_class = getClassFromString(to_class) to_class = getClassFromString(to_class)
folder = self.getObject()
for o in self.listFolderContents(): for o in self.listFolderContents():
# Make sure this sub object is not the same as object # Make sure this sub object is not the same as object
if o.getPhysicalPath() != self.getPhysicalPath(): if o.getPhysicalPath() != self.getPhysicalPath():
...@@ -1485,7 +1482,6 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn): ...@@ -1485,7 +1482,6 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn):
corrected_list = [] corrected_list = []
for object in from_object_related_object_list: for object in from_object_related_object_list:
#LOG('Folder.mergeContent, working on object:',0,object) #LOG('Folder.mergeContent, working on object:',0,object)
object_url = object.getRelativeUrl()
new_category_list = [] new_category_list = []
found = 0 found = 0
for category in object.getCategoryList(): # so ('destination/person/1',...) for category in object.getCategoryList(): # so ('destination/person/1',...)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment