summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/util/compat.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-06-21 18:34:14 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2011-06-21 18:34:14 -0400
commit7173d11ba2ad2275951c973a784b9f28396dea90 (patch)
tree6358b3b5d2c771ae86e39637534144e256a87a86 /lib/sqlalchemy/util/compat.py
parentcf7453e0019194256731a4cb10df50ac4256582f (diff)
downloadsqlalchemy-7173d11ba2ad2275951c973a784b9f28396dea90.tar.gz
- Use urllib.parse_qsl() in Python 2.6 and above,
no deprecation warning about cgi.parse_qsl() [ticket:1682]
Diffstat (limited to 'lib/sqlalchemy/util/compat.py')
-rw-r--r--lib/sqlalchemy/util/compat.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 69d648498..866c0c216 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -81,6 +81,14 @@ except ImportError:
return func(*(args + fargs), **newkeywords)
return newfunc
+
+if sys.version_info < (2, 6):
+ # emits a nasty deprecation warning
+ # in newer pythons
+ from cgi import parse_qsl
+else:
+ from urlparse import parse_qsl
+
if py3k:
# they're bringing it back in 3.2. brilliant !
def callable(fn):