Commit 9e98c1f2 authored by Andreas Jung's avatar Andreas Jung

Code cleanup

parent 3aa2fe25
...@@ -104,9 +104,9 @@ from ZCatalogIndexes import ZCatalogIndexes ...@@ -104,9 +104,9 @@ from ZCatalogIndexes import ZCatalogIndexes
from Products.PluginIndexes.common.PluggableIndex import PluggableIndexInterface from Products.PluginIndexes.common.PluggableIndex import PluggableIndexInterface
from Products.PluginIndexes.TextIndex.Vocabulary import Vocabulary from Products.PluginIndexes.TextIndex.Vocabulary import Vocabulary
from Products.PluginIndexes.TextIndex import Splitter from Products.PluginIndexes.TextIndex import Splitter
import string, urllib, os, sys, time import string, urllib, os, sys, time, types
StringType=type('')
manage_addZCatalogForm=DTMLFile('dtml/addZCatalog',globals()) manage_addZCatalogForm=DTMLFile('dtml/addZCatalog',globals())
...@@ -492,7 +492,7 @@ class ZCatalog(Folder, Persistent, Implicit): ...@@ -492,7 +492,7 @@ class ZCatalog(Folder, Persistent, Implicit):
"method if no unique id is provided when cataloging" "method if no unique id is provided when cataloging"
) )
else: uid=string.join(uid(), '/') else: uid=string.join(uid(), '/')
elif type(uid) is not StringType: elif not isinstance(uid,types.StringType):
raise CatalogError('The object unique id must be a string.') raise CatalogError('The object unique id must be a string.')
self._catalog.catalogObject(obj, uid, None,idxs) self._catalog.catalogObject(obj, uid, None,idxs)
......
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