Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #2 from williamhogman/master

Added proper imports for Python 3.2.
  • Loading branch information...
commit e1c4beafb28c13fb0f131abb25d339dcaa1ba798 2 parents 129282f + a909b6e
@berkerpeksag authored
Showing with 7 additions and 2 deletions.
  1. +1 −0  .travis.yml
  2. +6 −2 murl.py
View
1  .travis.yml
@@ -2,4 +2,5 @@ language: python
python:
- "2.6"
- "2.7"
+ - "3.2"
script: nosetests -v
View
8 murl.py
@@ -1,7 +1,11 @@
# coding: utf-8
-from urllib import urlencode
-from urlparse import urlparse, urlunparse, parse_qs, ParseResult
+try:
+ from urllib.parse import (urlencode, urlparse, urlunparse,
+ parse_qs, ParseResult)
+except ImportError:
+ from urllib import urlencode
+ from urlparse import urlparse, urlunparse, parse_qs, ParseResult
#: Parts for RFC 3986 URI syntax
#: <scheme>://<netloc>/<path>;<params>?<query>#<fragment>
Please sign in to comment.
Something went wrong with that request. Please try again.