fix some style issues

1 files changed, 19 insertions, 20 deletions

diff --git a/src/carquinyol/indexstore.py b/src/carquinyol/indexstore.py
index 25c1036..bbd6d79 100644
--- a/src/carquinyol/indexstore.py
+++ b/src/carquinyol/indexstore.py
@@ -46,7 +46,7 @@ _PROPERTIES_NOT_TO_INDEX = ['timestamp', 'preview']
 
 _MAX_RESULTS = int(2 ** 31 - 1)
 
-_query_term_map = {
+_QUERY_TERM_MAP = {
     'uid': _PREFIX_UID,
     'activity': _PREFIX_ACTIVITY,
     'activity_id': _PREFIX_ACTIVITY_ID,
@@ -54,7 +54,7 @@ _query_term_map = {
     'keep': _PREFIX_KEEP,
 }
 
-_query_value_map = {
+_QUERY_VALUE_MAP = {
     'timestamp': _VALUE_TIMESTAMP,
 }
 
@@ -93,14 +93,14 @@ class TermGenerator (xapian.TermGenerator):
         self._index_unknown(document, properties)
 
     def _index_known(self, document, properties):
-        for (name, prefix) in _query_term_map.items():
+        for name, prefix in _QUERY_TERM_MAP.items():
             if (name not in properties):
                 continue
 
             self._index_property(document, name, properties.pop(name), prefix)
 
     def _index_unknown(self, document, properties):
-        for (name, value) in properties.items():
+        for name, value in properties.items():
             self._index_property(document, name, value)
 
     def _index_property(self, doc, name, value, prefix=''):
@@ -114,7 +114,7 @@ class TermGenerator (xapian.TermGenerator):
 
         # add full value for dictionary-based searches
         # TODO: change query parser to generate phrase query instead
-        doc.add_term(prefix+value)
+        doc.add_term(prefix + value)
 
         # index with and without prefix so specifying a prefix is optional
         # in query strings
@@ -138,35 +138,34 @@ class QueryParser (xapian.QueryParser):
     def __init__(self):
         xapian.QueryParser.__init__(self)
 
-        for (name, prefix) in _query_term_map.items():
+        for name, prefix in _QUERY_TERM_MAP.items():
             self.add_prefix(name, prefix)
 
         self.add_valuerangeprocessor(DateRangeProcessor(_VALUE_TIMESTAMP))
 
-    def _parse_query_term(self, m_name, prefix, m_value):
+    def _parse_query_term(self, name, prefix, value):
         if isinstance(m_value, list):
-            return Query(Query.OP_OR, [
-                self._parse_query_term(m_name, prefix, word)
-                for word in m_value])
+            subqueries = [self._parse_query_term(name, prefix, word)
+                for word in value]
+            return Query(Query.OP_OR, subqueries)
 
         else:
-            return Query(prefix+str(m_value))
+            return Query(prefix+str(value))
 
     def _parse_query_value_range(self, name, value, value_no):
         if len(value) != 2:
             raise TypeError(
-                "Only tuples of size 2 have a defined meaning. " \
+                "Only tuples of size 2 have a defined meaning. "
                 "Did you mean to pass a list instead?")
 
         start, end = value
-        return Query(Query.OP_VALUE_RANGE,
-            value_no, str(start), str(end))
+        return Query(Query.OP_VALUE_RANGE, value_no, str(start), str(end))
 
     def _parse_query_value(self, name, value_no, value):
         if isinstance(value, list):
-            return Query(Query.OP_OR, [
-                self._parse_query_value(name, value_no, word)
-                for word in value])
+            subqueries = [self._parse_query_value(name, value_no, word)
+                for word in value]
+            return Query(Query.OP_OR, subqueries)
 
         elif isinstance(value, tuple):
             return self._parse_query_value_range(name, value, value_no)
@@ -179,7 +178,7 @@ class QueryParser (xapian.QueryParser):
 
         else:
             return Query(Query.OP_VALUE_RANGE,
-                _query_value_map[name], str(value), str(value))
+                _QUERY_VALUE_MAP[name], str(value), str(value))
 
     def _parse_query_xapian(self, query_str):
         try:
@@ -205,12 +204,12 @@ class QueryParser (xapian.QueryParser):
 
         queries += [
             self._parse_query_term(name, prefix, query_dict.pop(name))
-            for (name, prefix) in _query_term_map.items()
+            for name, prefix in _QUERY_TERM_MAP.items()
             if name in query_dict]
 
         queries += [
             self._parse_query_value(name, value_no, query_dict.pop(name))
-            for (name, value_no) in _query_value_map.items()
+            for name, value_no in _QUERY_VALUE_MAP.items()
             if name in query_dict]
 
         if not queries: