driver-six

Author: vgali7

cassandra/concurrent.py

@@ -145,15 +145,14 @@ def _execute(self, idx, statement, params):
         except Exception as exc:
             # exc_info with fail_fast to preserve stack trace info when raising on the client thread
             # (matches previous behavior -- not sure why we wouldn't want stack trace in the other case)
-            e = exc
 
             # If we're not failing fast and all executions are raising, there is a chance of recursing
             # here as subsequent requests are attempted. If we hit this threshold, schedule this result/retry
             # and let the event loop thread return.
             if self._exec_depth < self.max_error_recursion:
-                self._put_result(e, idx, False)
+                self._put_result(exc, idx, False)
             else:
-                self.session.submit(self._put_result, e, idx, False)
+                self.session.submit(self._put_result, exc, idx, False)
         self._exec_depth -= 1
 
     def _on_success(self, result, future, idx):

cassandra/cqltypes.py

@@ -56,7 +56,7 @@
 _little_endian_flag = 1  # we always serialize LE
 import ipaddress
 
-lambda x: x
+_ord = lambda x: x
 
 apache_cassandra_type_prefix = 'org.apache.cassandra.db.marshal.'
 
@@ -644,7 +644,7 @@ def serialize(v, protocol_version):
                     raise TypeError('DateType arguments must be a datetime, date, or timestamp')
                 timestamp = v
 
-        return int64_pack(int(timestamp))
+        return int64_pack(timestamp)
 
 
 class TimestampType(DateType):

tests/integration/datatype_utils.py

@@ -14,8 +14,8 @@
 
 from decimal import Decimal
 from datetime import datetime, date, time
-from uuid import uuid1, uuid4
 import ipaddress
+from uuid import uuid1, uuid4
 
 from cassandra.util import OrderedMap, Date, Time, sortedset, Duration
 

tests/integration/standard/test_types.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest
 import ipaddress
+import unittest
 
 from datetime import datetime
 import math

tests/unit/test_policies.py

@@ -142,26 +142,16 @@ def host_down():
 
         # make the GIL switch after every instruction, maximizing
         # the chance of race conditions
-        check = '__pypy__' in sys.builtin_module_names
-        if check:
-            original_interval = sys.getcheckinterval()
-        else:
-            original_interval = sys.getswitchinterval()
+        original_interval = sys.getswitchinterval()
 
         try:
-            if check:
-                sys.setcheckinterval(0)
-            else:
-                sys.setswitchinterval(0.0001)
+            sys.setswitchinterval(0.0001)
             for t in threads:
                 t.start()
             for t in threads:
                 t.join()
         finally:
-            if check:
-                sys.setcheckinterval(original_interval)
-            else:
-                sys.setswitchinterval(original_interval)
+            sys.setswitchinterval(original_interval)
 
         if errors:
             self.fail("Saw errors: %s" % (errors,))