[Checkins] SVN: Products.ZCatalog/trunk/src/Products/PluginIndexes/ more pep8
Hano Schlichting
cvs-admin at zope.org
Sun Apr 8 16:34:16 UTC 2012
Log message for revision 125112:
more pep8
Changed:
U Products.ZCatalog/trunk/src/Products/PluginIndexes/BooleanIndex/BooleanIndex.py
U Products.ZCatalog/trunk/src/Products/PluginIndexes/DateIndex/DateIndex.py
U Products.ZCatalog/trunk/src/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py
U Products.ZCatalog/trunk/src/Products/PluginIndexes/TopicIndex/TopicIndex.py
U Products.ZCatalog/trunk/src/Products/PluginIndexes/common/UnIndex.py
-=-
Modified: Products.ZCatalog/trunk/src/Products/PluginIndexes/BooleanIndex/BooleanIndex.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/PluginIndexes/BooleanIndex/BooleanIndex.py 2012-04-08 16:08:37 UTC (rev 125111)
+++ Products.ZCatalog/trunk/src/Products/PluginIndexes/BooleanIndex/BooleanIndex.py 2012-04-08 16:34:12 UTC (rev 125112)
@@ -40,7 +40,7 @@
meta_type = "BooleanIndex"
- manage_options= (
+ manage_options = (
{'label': 'Settings',
'action': 'manage_main'},
{'label': 'Browse',
Modified: Products.ZCatalog/trunk/src/Products/PluginIndexes/DateIndex/DateIndex.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/PluginIndexes/DateIndex/DateIndex.py 2012-04-08 16:08:37 UTC (rev 125111)
+++ Products.ZCatalog/trunk/src/Products/PluginIndexes/DateIndex/DateIndex.py 2012-04-08 16:34:12 UTC (rev 125112)
@@ -82,7 +82,6 @@
class DateIndex(UnIndex, PropertyManager):
-
"""Index for dates.
"""
implements(IDateIndex)
@@ -162,12 +161,11 @@
return None
keys = map(self._convert, record.keys)
-
index = self._index
r = None
opr = None
- #experimental code for specifing the operator
+ # experimental code for specifying the operator
operator = record.get('operator', self.useOperator)
if not operator in self.operators:
raise RuntimeError("operator not valid: %s" % operator)
@@ -193,7 +191,7 @@
opr = record.usage.lower().split(':')
opr, opr_args = opr[0], opr[1:]
- if opr == "range": # range search
+ if opr == "range": # range search
if 'min' in opr_args:
lo = min(keys)
else:
@@ -231,8 +229,6 @@
def _convert(self, value, default=None):
"""Convert Date/Time value to our internal representation"""
- # XXX: Code patched 20/May/2003 by Kiran Jonnalagadda to
- # convert dates to UTC first.
if isinstance(value, DateTime):
t_tup = value.toZone('UTC').parts()
elif isinstance(value, (float, int)):
Modified: Products.ZCatalog/trunk/src/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py 2012-04-08 16:08:37 UTC (rev 125111)
+++ Products.ZCatalog/trunk/src/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py 2012-04-08 16:34:12 UTC (rev 125112)
@@ -39,7 +39,7 @@
from Products.PluginIndexes.interfaces import IDateRangeIndex
_dtmldir = os.path.join(package_home(globals()), 'dtml')
-MAX32 = int(2**31 - 1)
+MAX32 = int(2 ** 31 - 1)
class RequestCache(dict):
@@ -75,9 +75,9 @@
meta_type = "DateRangeIndex"
query_options = ('query', )
- manage_options= ({'label': 'Properties',
- 'action': 'manage_indexProperties'},
- )
+ manage_options = ({'label': 'Properties',
+ 'action': 'manage_indexProperties'},
+ )
since_field = until_field = None
@@ -126,8 +126,7 @@
security.declareProtected(manage_zcatalog_indexes, 'manage_edit')
def manage_edit(self, since_field, until_field, floor_value,
ceiling_value, REQUEST):
- """
- """
+ """"""
self._edit(since_field, until_field, floor_value, ceiling_value)
REQUEST['RESPONSE'].redirect('%s/manage_main'
'?manage_tabs_message=Updated'
@@ -147,9 +146,7 @@
security.declareProtected(manage_zcatalog_indexes, 'clear')
def clear(self):
- """
- Start over fresh.
- """
+ """Start over fresh."""
self._always = IITreeSet()
self._since_only = IOBTree()
self._until_only = IOBTree()
@@ -158,26 +155,18 @@
self._unindex = IOBTree() # 'datum' will be a tuple of date ints
self._length = Length()
- #
- # PluggableIndexInterface implementation (XXX inherit assertions?)
- #
def getEntryForObject(self, documentId, default=None):
+ """Get all information contained for the specific object
+ identified by 'documentId'. Return 'default' if not found.
"""
- Get all information contained for the specific object
- identified by 'documentId'. Return 'default' if not found.
- """
return self._unindex.get(documentId, default)
def index_object(self, documentId, obj, threshold=None):
+ """Index an object:
+ - 'documentId' is the integer ID of the document
+ - 'obj' is the object to be indexed
+ - ignore threshold
"""
- Index an object:
-
- - 'documentId' is the integer ID of the document
-
- - 'obj' is the object to be indexed
-
- - ignore threshold
- """
if self._since_field is None:
return 0
@@ -207,9 +196,8 @@
return 1
def unindex_object(self, documentId):
+ """Remove the object corresponding to 'documentId' from the index.
"""
- Remove the object corresponding to 'documentId' from the index.
- """
datum = self._unindex.get(documentId, None)
if datum is None:
return
@@ -219,11 +207,10 @@
del self._unindex[documentId]
def uniqueValues(self, name=None, withLengths=0):
- """
- Return a list of unique values for 'name'.
+ """Return a list of unique values for 'name'.
- If 'withLengths' is true, return a sequence of tuples, in
- the form '(value, length)'.
+ If 'withLengths' is true, return a sequence of tuples, in
+ the form '(value, length)'.
"""
if not name in (self._since_field, self._until_field):
return []
@@ -264,17 +251,16 @@
return cid
def _apply_index(self, request, resultset=None):
- """
- Apply the index to query parameters given in 'request', which
- should be a mapping object.
+ """Apply the index to query parameters given in 'request', which
+ should be a mapping object.
- If the request does not contain the needed parameters, then
- return None.
+ If the request does not contain the needed parameters, then
+ return None.
- Otherwise return two objects. The first object is a ResultSet
- containing the record numbers of the matching records. The
- second object is a tuple containing the names of all data fields
- used.
+ Otherwise return two objects. The first object is a ResultSet
+ containing the record numbers of the matching records. The
+ second object is a tuple containing the names of all data fields
+ used.
"""
iid = self.id
record = parseIndexRequest(request, iid, self.query_options)
@@ -416,9 +402,8 @@
def manage_addDateRangeIndex(self, id, extra=None,
REQUEST=None, RESPONSE=None, URL3=None):
+ """Add a date range index to the catalog, using the incredibly icky
+ double-indirection-which-hides-NOTHING.
"""
- Add a date range index to the catalog, using the incredibly icky
- double-indirection-which-hides-NOTHING.
- """
return self.manage_addIndex(id, 'DateRangeIndex', extra,
REQUEST, RESPONSE, URL3)
Modified: Products.ZCatalog/trunk/src/Products/PluginIndexes/TopicIndex/TopicIndex.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/PluginIndexes/TopicIndex/TopicIndex.py 2012-04-08 16:08:37 UTC (rev 125111)
+++ Products.ZCatalog/trunk/src/Products/PluginIndexes/TopicIndex/TopicIndex.py 2012-04-08 16:34:12 UTC (rev 125112)
@@ -33,7 +33,6 @@
class TopicIndex(Persistent, SimpleItem):
-
"""A TopicIndex maintains a set of FilteredSet objects.
Every FilteredSet object consists of an expression and and IISet with all
@@ -86,12 +85,13 @@
return "n/a"
def search(self, filter_id):
- if self.filteredSets.has_key(filter_id):
- return self.filteredSets[filter_id].getIds()
+ f = self.filteredSets.get(filter_id, None)
+ if f is not None:
+ return f.getIds()
def _apply_index(self, request):
- """ hook for (Z)Catalog
- 'request' -- mapping type (usually {"topic": "..." }
+ """hook for (Z)Catalog
+ 'request' -- mapping type (usually {"topic": "..." }
"""
record = parseIndexRequest(request, self.id, self.query_options)
if record.keys is None:
@@ -125,7 +125,7 @@
def addFilteredSet(self, filter_id, typeFilteredSet, expr):
# Add a FilteredSet object.
- if self.filteredSets.has_key(filter_id):
+ if filter_id in self.filteredSets:
raise KeyError(
'A FilteredSet with this name already exists: %s' % filter_id)
self.filteredSets[filter_id] = factory(filter_id,
@@ -135,17 +135,17 @@
def delFilteredSet(self, filter_id):
# Delete the FilteredSet object specified by 'filter_id'.
- if not self.filteredSets.has_key(filter_id):
+ if filter_id not in self.filteredSets:
raise KeyError(
'no such FilteredSet: %s' % filter_id)
del self.filteredSets[filter_id]
def clearFilteredSet(self, filter_id):
# Clear the FilteredSet object specified by 'filter_id'.
- if not self.filteredSets.has_key(filter_id):
- raise KeyError(
- 'no such FilteredSet: %s' % filter_id)
- self.filteredSets[filter_id].clear()
+ f = self.filteredSets.get(filter_id, None)
+ if f is None:
+ raise KeyError('no such FilteredSet: %s' % filter_id)
+ f.clear()
def manage_addFilteredSet(self, filter_id, typeFilteredSet, expr, URL1, \
REQUEST=None, RESPONSE=None):
Modified: Products.ZCatalog/trunk/src/Products/PluginIndexes/common/UnIndex.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/PluginIndexes/common/UnIndex.py 2012-04-08 16:08:37 UTC (rev 125111)
+++ Products.ZCatalog/trunk/src/Products/PluginIndexes/common/UnIndex.py 2012-04-08 16:34:12 UTC (rev 125112)
@@ -88,8 +88,8 @@
return getattr(o, k, default)
self.id = id
- self.ignore_ex=ignore_ex # currently unimplimented
- self.call_methods=call_methods
+ self.ignore_ex = ignore_ex # currently unimplemented
+ self.call_methods = call_methods
self.operators = ('or', 'and')
self.useOperator = 'or'
@@ -100,8 +100,8 @@
self.indexed_attrs = ia.split(',')
else:
self.indexed_attrs = list(ia)
- self.indexed_attrs = [ attr.strip()
- for attr in self.indexed_attrs if attr ]
+ self.indexed_attrs = [
+ attr.strip() for attr in self.indexed_attrs if attr]
if not self.indexed_attrs:
self.indexed_attrs = [id]
@@ -127,13 +127,12 @@
"""
histogram = {}
for item in self._index.items():
- if isinstance(item,int):
- entry = 1 # "set" length is 1
+ if isinstance(item, int):
+ entry = 1 # "set" length is 1
else:
key, value = item
entry = len(value)
histogram[entry] = histogram.get(entry, 0) + 1
-
return histogram
def referencedObjects(self):
@@ -146,8 +145,7 @@
"""
if default is _marker:
return self._unindex.get(documentId)
- else:
- return self._unindex.get(documentId, default)
+ return self._unindex.get(documentId, default)
def removeForwardIndexEntry(self, entry, documentId):
"""Take the entry provided and remove any reference to documentId
@@ -212,13 +210,10 @@
def index_object(self, documentId, obj, threshold=None):
""" wrapper to handle indexing of multiple attributes """
-
fields = self.getIndexSourceNames()
-
res = 0
for attr in fields:
res += self._index_object(documentId, obj, threshold, attr)
-
return res > 0
def _index_object(self, documentId, obj, threshold=None, attr=''):
@@ -251,7 +246,7 @@
return returnStatus
- def _get_object_datum(self,obj, attr):
+ def _get_object_datum(self, obj, attr):
# self.id is the name of the index, which is also the name of the
# attribute we're interested in. If the attribute is callable,
# we'll do so.
@@ -280,7 +275,6 @@
return None
self.removeForwardIndexEntry(unindexRecord, documentId)
-
try:
del self._unindex[documentId]
except ConflictError:
@@ -341,8 +335,8 @@
return None
index = self._index
- r = None
- opr = None
+ r = None
+ opr = None
# not / exclude parameter
not_parm = record.get('not', None)
@@ -351,32 +345,36 @@
record.keys = [k for k in index.keys() if k not in not_parm]
# experimental code for specifing the operator
- operator = record.get('operator',self.useOperator)
- if not operator in self.operators :
+ operator = record.get('operator', self.useOperator)
+ if not operator in self.operators:
raise RuntimeError("operator not valid: %s" % escape(operator))
# Range parameter
- range_parm = record.get('range',None)
+ range_parm = record.get('range', None)
if range_parm:
opr = "range"
opr_args = []
- if range_parm.find("min")>-1:
+ if range_parm.find("min") > -1:
opr_args.append("min")
- if range_parm.find("max")>-1:
+ if range_parm.find("max") > -1:
opr_args.append("max")
- if record.get('usage',None):
+ if record.get('usage', None):
# see if any usage params are sent to field
opr = record.usage.lower().split(':')
- opr, opr_args=opr[0], opr[1:]
+ opr, opr_args = opr[0], opr[1:]
- if opr=="range": # range search
- if 'min' in opr_args: lo = min(record.keys)
- else: lo = None
- if 'max' in opr_args: hi = max(record.keys)
- else: hi = None
+ if opr == "range": # range search
+ if 'min' in opr_args:
+ lo = min(record.keys)
+ else:
+ lo = None
+ if 'max' in opr_args:
+ hi = max(record.keys)
+ else:
+ hi = None
if hi:
- setlist = index.values(lo,hi)
+ setlist = index.values(lo, hi)
else:
setlist = index.values(lo)
@@ -413,7 +411,7 @@
# the result is bound by the resultset
r = intersection(r, s)
- else: # not a range search
+ else: # not a range search
# Filter duplicates
setlist = []
for k in record.keys:
@@ -471,8 +469,7 @@
"""has unique values for column name"""
if name == self.id:
return 1
- else:
- return 0
+ return 0
def getIndexSourceNames(self):
""" return sequence of indexed attributes """
@@ -493,7 +490,7 @@
if not withLengths:
return tuple(self._index.keys())
else:
- rl=[]
+ rl = []
for i in self._index.keys():
set = self._index[i]
if isinstance(set, int):
@@ -504,7 +501,7 @@
return tuple(rl)
def keyForDocument(self, id):
- # This method is superceded by documentToKeyMap
+ # This method is superseded by documentToKeyMap
return self._unindex[id]
def documentToKeyMap(self):
@@ -512,7 +509,7 @@
def items(self):
items = []
- for k,v in self._index.items():
+ for k, v in self._index.items():
if isinstance(v, int):
v = IISet((v,))
items.append((k, v))
More information about the checkins
mailing list