Python 3 support

singingwolfboy · singingwolfboy · commit 349d100a070c · 2013-11-04T19:41:46.000-05:00
diff --git a/flask_heroku.py b/flask_heroku.py
@@ -1,7 +1,10 @@
 #!/usr/bin/env python
 
-import urlparse
 from os import environ
+try:
+    from urllib.parse import urlparse
+except ImportError:
+    from urlparse import urlparse
 
 class Heroku(object):
     """Heroku configurations for flask."""
@@ -49,15 +52,15 @@ def init_app(self, app):
         # Redis To Go
         redis_url = environ.get('REDISTOGO_URL')
         if redis_url:
-            url = urlparse.urlparse(redis_url)
+            url = urlparse(redis_url)
             app.config.setdefault('REDIS_HOST', url.hostname)
             app.config.setdefault('REDIS_PORT', url.port)
             app.config.setdefault('REDIS_PASSWORD', url.password)
 
         # Mongolab
         mongolab_uri = environ.get('MONGOLAB_URI')
         if mongolab_uri:
-            url = urlparse.urlparse(mongolab_uri)
+            url = urlparse(mongolab_uri)
             app.config.setdefault('MONGO_URI', mongolab_uri)
             app.config.setdefault('MONGODB_USER', url.username)
             app.config.setdefault('MONGODB_PASSWORD', url.password)
@@ -68,7 +71,7 @@ def init_app(self, app):
         # MongoHQ
         mongohq_uri = environ.get('MONGOHQ_URL')
         if mongohq_uri:
-            url = urlparse.urlparse(mongohq_uri)
+            url = urlparse(mongohq_uri)
             app.config.setdefault('MONGO_URI', mongohq_uri)
             app.config.setdefault('MONGODB_USER', url.username)
             app.config.setdefault('MONGODB_PASSWORD', url.password)
diff --git a/setup.py b/setup.py
@@ -29,6 +29,7 @@
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 3',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ]

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`'License :: OSI Approved :: BSD License',`
`30`	`30`	`'Operating System :: OS Independent',`
`31`	`31`	`'Programming Language :: Python',`
	`32`	`+ 'Programming Language :: Python :: 3',`
`32`	`33`	`'Topic :: Internet :: WWW/HTTP :: Dynamic Content',`
`33`	`34`	`'Topic :: Software Development :: Libraries :: Python Modules'`
`34`	`35`	`]`