diff options
author | mrtheb <mrlabbe@gmail.com> | 2014-01-31 22:43:59 -0500 |
---|---|---|
committer | mrtheb <mrlabbe@gmail.com> | 2014-01-31 22:43:59 -0500 |
commit | 84de472a4d5b583ff3ed6cc6d92250a7c9291ceb (patch) | |
tree | e3d03da4eeecf8eab2dc63cf113a4daf82addf72 /kafka/queue.py | |
parent | 0bdff4e833f73518a7219fca04dfbc3ed201b06e (diff) | |
parent | 4abf7ee1fbbdc47c8cb7b35f2600e58f1f95e6bb (diff) | |
download | kafka-python-84de472a4d5b583ff3ed6cc6d92250a7c9291ceb.tar.gz |
Merge branch 'master' into multihosts
Conflicts:
kafka/client.py
kafka/conn.py
setup.py
test/test_integration.py
test/test_unit.py
Diffstat (limited to 'kafka/queue.py')
-rw-r--r-- | kafka/queue.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kafka/queue.py b/kafka/queue.py index a996369..ada495f 100644 --- a/kafka/queue.py +++ b/kafka/queue.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + from copy import copy import logging from multiprocessing import Process, Queue, Event |