Clean lgtm (#95)

* misc cleanup

* test result change with issue 1601

* stop use depricated

* revert fix for 1601

Author: ashtul

redisearch/aggregation.py

@@ -27,7 +27,6 @@ def __init__(self, *args):
         self._args = args
         self._field = None
         self._alias = None
-        pass
 
     def alias(self, alias):
         """

redisearch/client.py

@@ -1,12 +1,11 @@
-from redis import Redis, RedisError, ConnectionPool
+from redis import Redis, ConnectionPool
 import itertools
 import time
 import six
-from six.moves import zip
 
 from .document import Document
 from .result import Result
-from .query import Query, Filter
+from .query import Query
 from ._util import to_string
 from .aggregation import AggregateRequest, AggregateResult, Cursor
 
@@ -494,11 +493,9 @@ def aggregate(self, query):
         `rows` property, which will always yield the rows of the result
         """
         if isinstance(query, AggregateRequest):
-            has_schema = query._with_schema
             has_cursor = bool(query._cursor)
             cmd = [self.AGGREGATE_CMD, self.index_name] + query.build_args()
         elif isinstance(query, Cursor):
-            has_schema = False
             has_cursor = True
             cmd = [self.CURSOR_CMD, 'READ',
                    self.index_name] + query.build_args()

redisearch/querystring.py

@@ -81,7 +81,7 @@ def make_value(v):
         return ScalarValue(v)
 
     def to_string(self):
-        raise NotImplemented()
+        raise NotImplementedError()
 
     def __str__(self):
         return self.to_string()
@@ -100,7 +100,6 @@ def __init__(self, a, b, inclusive_min=False, inclusive_max=False):
         self.inclusive_max = inclusive_max
 
     def to_string(self):
-        a, b = self.range
         return '[{1}{0[0]} {2}{0[1]}]'.format(self.range,
                                     '(' if not self.inclusive_min else '',
                                     '(' if not self.inclusive_max else '',)
@@ -211,7 +210,7 @@ def to_node(cls, obj):
 
     @property
     def JOINSTR(self):
-        raise NotImplemented()
+        raise NotImplementedError()
 
     def to_string(self, with_parens=None):
         with_parens = self._should_use_paren(with_parens)

test/test.py

@@ -43,7 +43,6 @@ def check_version_2(env):
         env.execute_command('FT.ADDHASH foo bar 1')
     except redis.ResponseError as e:
         # Support for FT.ADDHASH was removed in RediSearch 2.0
-        print( str(e))
         if str(e).startswith('unknown command `FT.ADDHASH`'):
             return True
         return False
@@ -453,14 +452,14 @@ def testAutoComplete(self):
                 self.assertEqual(2, len(ret))
                 self.assertEqual('badger', ret[0].string)
                 self.assertIsInstance(ret[0].score, float)
-                self.assertNotEquals(1.0, ret[0].score)
+                self.assertNotEqual(1.0, ret[0].score)
                 self.assertEqual('badalte rishtey', ret[1].string)
                 self.assertIsInstance(ret[1].score, float)
-                self.assertNotEquals(1.0, ret[1].score)
+                self.assertNotEqual(1.0, ret[1].score)
 
                 ret= ac.get_suggestions('bad', fuzzy=True, num=10)
                 self.assertEqual(10, len(ret))
-                self.assertEquals(1.0, ret[0].score)
+                self.assertEqual(1.0, ret[0].score)
                 strs = {x.string for x in ret}
 
             for sug in strs:
@@ -622,7 +621,7 @@ def testTags(self):
                 self.assertEqual(1, res.total)
 
                 q2 = client.tagvals('tags')
-                self.assertEqual(tags.split(',') + tags2.split(','), q2)
+                self.assertEqual((tags.split(',') + tags2.split(',')).sort(), q2.sort())
 
     def testTextFieldSortableNostem(self):
         conn = self.redis()