summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Bangert <ben@groovie.org>2013-07-31 13:53:25 -0700
committerBen Bangert <ben@groovie.org>2013-07-31 13:53:25 -0700
commit2d4be17e7cb8d4dbc9df62c841bdb16c5e52d24e (patch)
tree4a2060f624626af4f73fdd5f374bf966218b1d58
parentb63865055b3d1b0f15f9f1218d6369170aea6f87 (diff)
downloadkazoo-2d4be17e7cb8d4dbc9df62c841bdb16c5e52d24e.tar.gz
- Issue #108: Circular import fail when importing kazoo.recipe.watchers
directly has now been resolved. Watchers and partitioner properly import the KazooState from kazoo.protocol.states rather than kazoo.client.
-rw-r--r--CHANGES.rst3
-rw-r--r--kazoo/recipe/partitioner.py2
-rw-r--r--kazoo/recipe/watchers.py2
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 29fe671..9b41224 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,9 @@ Changelog
Bug Handling
************
+- Issue #108: Circular import fail when importing kazoo.recipe.watchers
+ directly has now been resolved. Watchers and partitioner properly import
+ the KazooState from kazoo.protocol.states rather than kazoo.client.
- Issue #109: Partials not usable properly as a datawatch call can now be
used. All funcs will be called with 3 args and fall back to 2 args if
there's an argument error.
diff --git a/kazoo/recipe/partitioner.py b/kazoo/recipe/partitioner.py
index ff1495d..e32cbbf 100644
--- a/kazoo/recipe/partitioner.py
+++ b/kazoo/recipe/partitioner.py
@@ -19,8 +19,8 @@ import os
import socket
from functools import partial
-from kazoo.client import KazooState
from kazoo.exceptions import KazooException
+from kazoo.protocol.states import KazooState
from kazoo.recipe.watchers import PatientChildrenWatch
log = logging.getLogger(__name__)
diff --git a/kazoo/recipe/watchers.py b/kazoo/recipe/watchers.py
index 523fb32..8d50828 100644
--- a/kazoo/recipe/watchers.py
+++ b/kazoo/recipe/watchers.py
@@ -5,9 +5,9 @@ import time
import warnings
from functools import partial, wraps
-from kazoo.client import KazooState
from kazoo.retry import KazooRetry
from kazoo.exceptions import ConnectionClosedError, NoNodeError
+from kazoo.protocol.states import KazooState
log = logging.getLogger(__name__)