Merge remote-tracking branch 'origin/pr/32'

2013-11-10 12:42:59 +01:00 · 2013-11-10 12:42:59 +01:00 · 80aaf15128
commit 80aaf15128
parent 18d7f37878 68be70af24
1 changed files with 4 additions and 1 deletions
--- a/isso/utils/init.py
+++ b/isso/utils/init.py
@ -14,7 +14,10 @@ from string import ascii_letters, digits
 from werkzeug.wrappers import Request
 from werkzeug.exceptions import BadRequest

-import ipaddress
+try:
+    import ipaddress
+except ImportError:
+    import ipaddr as ipaddress


 def anonymize(remote_addr):