summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorMark Roberts <markroberts@kixeye.com>2014-02-26 21:36:22 -0800
committerMark Roberts <markroberts@kixeye.com>2014-02-26 21:36:22 -0800
commit112158fa75879e2343c361c00a8aecb176dbb767 (patch)
treeb09b03781394c553ad902ca4a941865b74a76125 /setup.py
parent3b39d9d6589ee46ae4d31fb078f44019a2810983 (diff)
parentab89a44ecf9c93b116fcc8516cfc21749df74507 (diff)
downloadkafka-python-112158fa75879e2343c361c00a8aecb176dbb767.tar.gz
Merge branch 'master' into conn_refactor
Conflicts: example.py
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 0869fee..4176135 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,10 @@
-import os.path
import sys
from setuptools import setup, Command
class Tox(Command):
+
user_options = []
def initialize_options(self):