diff --git a/setup.py b/setup.py index d3ba8c7..f136d95 100644 --- a/setup.py +++ b/setup.py @@ -9,18 +9,18 @@ import sys import itertools def version(): - version_py = os.path.join(os.path.dirname(__file__), "zulip", "__init__.py") - with open(version_py) as in_handle: - version_line = itertools.dropwhile(lambda x: not x.startswith("__version__"), - in_handle).next() - version = version_line.split('=')[-1].strip().replace('"', '') - return version + version_py = os.path.join(os.path.dirname(__file__), "zulip", "__init__.py") + with open(version_py) as in_handle: + version_line = itertools.dropwhile(lambda x: not x.startswith("__version__"), + in_handle).next() + version = version_line.split('=')[-1].strip().replace('"', '') + return version def recur_expand(target_root, dir): - for root, _, files in os.walk(dir): - paths = [os.path.join(root, f) for f in files] - if len(paths): - yield os.path.join(target_root, root), paths + for root, _, files in os.walk(dir): + paths = [os.path.join(root, f) for f in files] + if len(paths): + yield os.path.join(target_root, root), paths # We should be installable with either setuptools or distutils. package_info = dict( @@ -53,23 +53,23 @@ setuptools_info = dict( ) try: - from setuptools import setup - package_info.update(setuptools_info) + from setuptools import setup + package_info.update(setuptools_info) except ImportError: - from distutils.core import setup - from distutils.version import LooseVersion - # Manual dependency check - try: - import simplejson - except ImportError: - print >>sys.stderr, "simplejson is not installed" - sys.exit(1) - try: - import requests - assert(LooseVersion(requests.__version__) >= LooseVersion('0.12.1')) - except (ImportError, AssertionError): - print >>sys.stderr, "requests >=0.12.1 is not installed" - sys.exit(1) + from distutils.core import setup + from distutils.version import LooseVersion + # Manual dependency check + try: + import simplejson + except ImportError: + print >>sys.stderr, "simplejson is not installed" + sys.exit(1) + try: + import requests + assert(LooseVersion(requests.__version__) >= LooseVersion('0.12.1')) + except (ImportError, AssertionError): + print >>sys.stderr, "requests >=0.12.1 is not installed" + sys.exit(1) setup(**package_info)