Merge pull request #340 from rgs1/fix-nameerror-basestring

Fix NameError with basestring (in py3k)

2 files changed, 16 insertions, 3 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index 039c213..ab85b3e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,19 @@
 Changelog
 =========
 
+2.2.1 (2015-XX-XX)
+-----
+
+Features
+********
+
+Bug Handling
+************
+- handle NameError with basestring on py3k.
+
+Documentation
+*************
+
 2.2 (2015-06-15)
 ----------------
 
diff --git a/kazoo/client.py b/kazoo/client.py
index 7850f4c..27fbe00 100644
--- a/kazoo/client.py
+++ b/kazoo/client.py
@@ -1404,11 +1404,11 @@ class KazooClient(object):
         :rtype: :class:`~kazoo.interfaces.IAsyncResult`
 
         """
-        if joining and not isinstance(joining, basestring):
+        if joining and not isinstance(joining, string_types):
             raise TypeError("Invalid type for 'joining' (string expected)")
-        if leaving and not isinstance(leaving, basestring):
+        if leaving and not isinstance(leaving, string_types):
             raise TypeError("Invalid type for 'leaving' (string expected)")
-        if new_members and not isinstance(new_members, basestring):
+        if new_members and not isinstance(new_members, string_types):
             raise TypeError("Invalid type for 'new_members' (string "
                             "expected)")
         if not isinstance(from_config, int):