Revive Py2

inducer · Jan 31, 2016 · 7244a08 · 7244a08
1 parent 8d899c8
commit 7244a08
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/bin/synoptic b/bin/synoptic
@@ -1,5 +1,6 @@
 #! /usr/bin/env python2.5
 from __future__ import absolute_import, print_function
+import six
 
 
 def get_data_path():
@@ -88,7 +89,7 @@ def main():
         from ipaddress import ip_network
         for net_str in args.allow_ip.split(","):
             if net_str:
-                allowed_networks.append(ip_network(net_str))
+                allowed_networks.append(ip_network(six.text_type(net_str)))
 
     from synoptic import Application
     real_app = app = Application(allowed_networks=allowed_networks)

diff --git a/setup.py b/setup.py
@@ -4,6 +4,12 @@
 
 
 def main():
+    import sys
+
+    extra_requires = []
+    if sys.version_info < (3,):
+        extra_requires += ["ipaddress"]
+
     from setuptools import setup, find_packages
 
     setup(name="synoptic",
@@ -40,7 +46,7 @@ def main():
               ],
           zip_safe=False,
 
-          install_requires=[
+          install_requires=extra_requires + [
               "Paste>=2",
               "SQLAlchemy>=0.8",
               "sqlalchemy-migrate>=0.7.2.24",

diff --git a/synoptic/__init__.py b/synoptic/__init__.py
@@ -293,7 +293,7 @@ def __call__(self, environ, start_response):
                         "but allowed_networks was specified")
 
             from ipaddress import ip_address
-            remote_addr = ip_address(remote_addr_str)
+            remote_addr = ip_address(six.text_type(remote_addr_str))
 
             allowed = False