Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #2 from williamhogman/master

Added proper imports for Python 3.2.
  • Loading branch information...
commit e1c4beafb28c13fb0f131abb25d339dcaa1ba798 2 parents 129282f + a909b6e
Berker Peksag authored

Showing 2 changed files with 7 additions and 2 deletions. Show diff stats Hide diff stats

  1. +1 0  .travis.yml
  2. +6 2 murl.py
1  .travis.yml
@@ -2,4 +2,5 @@ language: python
2 2 python:
3 3 - "2.6"
4 4 - "2.7"
  5 + - "3.2"
5 6 script: nosetests -v
8 murl.py
... ... @@ -1,7 +1,11 @@
1 1 # coding: utf-8
2 2
3   -from urllib import urlencode
4   -from urlparse import urlparse, urlunparse, parse_qs, ParseResult
  3 +try:
  4 + from urllib.parse import (urlencode, urlparse, urlunparse,
  5 + parse_qs, ParseResult)
  6 +except ImportError:
  7 + from urllib import urlencode
  8 + from urlparse import urlparse, urlunparse, parse_qs, ParseResult
5 9
6 10 #: Parts for RFC 3986 URI syntax
7 11 #: <scheme>://<netloc>/<path>;<params>?<query>#<fragment>

0 comments on commit e1c4bea

Please sign in to comment.
Something went wrong with that request. Please try again.