cleanup pre-PYTHON-838

mambocab · mambocab · commit 55167353c8b5 · 2017-10-25T13:31:36.000-04:00
- remove new sentinel; reuse _NOT_SET
- add file-terminating newline
diff --git a/cassandra/cluster.py b/cassandra/cluster.py
@@ -312,8 +312,6 @@ class _ConfigMode(object):
     PROFILES = 2
 
 
-_UNSET_ARG = object()
-
 class Cluster(object):
     """
     The main class to use when interacting with a Cassandra cluster.
@@ -735,7 +733,7 @@ def token_metadata_enabled(self, enabled):
     _listener_lock = None
 
     def __init__(self,
-                 contact_points=_UNSET_ARG,
+                 contact_points=_NOT_SET,
                  port=9042,
                  compression=True,
                  auth_provider=None,
@@ -772,7 +770,7 @@ def __init__(self,
 
         Any of the mutable Cluster attributes may be set as keyword arguments to the constructor.
         """
-        if contact_points is not _UNSET_ARG and load_balancing_policy is None:
+        if contact_points is not _NOT_SET and load_balancing_policy is None:
             log.warn('Cluster.__init__ called with contact_points specified, '
                      'but no load_balancing_policy. In the next major '
                      'version, this will raise an error; please specify a '
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -90,4 +90,4 @@ def is_monkey_patched():
 
 notwindows = unittest.skipUnless(not "Windows" in platform.system(), "This test is not adequate for windows")
 notpypy = unittest.skipUnless(not platform.python_implementation() == 'PyPy', "This tests is not suitable for pypy")
-notmonkeypatch = unittest.skipUnless(MONKEY_PATCH_LOOP, "Skipping this test because monkey patching is required")
+notmonkeypatch = unittest.skipUnless(MONKEY_PATCH_LOOP, "Skipping this test because monkey patching is required")
