summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Shadura <andrewsh@debian.org>2016-07-05 16:56:21 +0200
committerAndrew Shadura <andrewsh@debian.org>2016-07-05 16:57:35 +0200
commitfdf60c3b266887bdd65d92dceb1fab693d2ea4b6 (patch)
tree844e962082443f6ff02d3f57e0f3846c885874c8
parentc7c456932e89351e551bf1c1045c56c65b396c77 (diff)
Apply patches for dgit.debian/2.4.0-1
-rw-r--r--README.md4
-rw-r--r--urlobject/netloc.py2
-rw-r--r--urlobject/path.py2
-rw-r--r--urlobject/query_string.py2
-rw-r--r--urlobject/urlobject.py2
5 files changed, 5 insertions, 7 deletions
diff --git a/README.md b/README.md
index 28b267b..148db9e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
# URLObject 2
-[![Build Status](https://secure.travis-ci.org/zacharyvoase/urlobject.png?branch=master)](http://travis-ci.org/zacharyvoase/urlobject)
-
`URLObject` is a utility class for manipulating URLs. The latest incarnation of
this library builds upon the ideas of its predecessor, but aims for a clearer
API, focusing on proper method names over operator overrides. It's also being
@@ -50,7 +48,7 @@ For more information, please refer to <http://unlicense.org/>
### Credits
-This library bundles [six][], which is licensed as follows:
+This library uses [six][], which is licensed as follows:
[six]: http://packages.python.org/six/
diff --git a/urlobject/netloc.py b/urlobject/netloc.py
index c37c47b..4da6569 100644
--- a/urlobject/netloc.py
+++ b/urlobject/netloc.py
@@ -1,5 +1,5 @@
from .compat import urlparse
-from .six import text_type, u
+from six import text_type, u
class Netloc(text_type):
diff --git a/urlobject/path.py b/urlobject/path.py
index 3b9af33..a132eda 100644
--- a/urlobject/path.py
+++ b/urlobject/path.py
@@ -4,7 +4,7 @@ import posixpath
import urllib
from .compat import urlparse
-from .six import text_type, u
+from six import text_type, u
class Root(object):
diff --git a/urlobject/query_string.py b/urlobject/query_string.py
index bd7913f..d5b0155 100644
--- a/urlobject/query_string.py
+++ b/urlobject/query_string.py
@@ -3,7 +3,7 @@ import re
import urllib
from .compat import urlparse
-from .six import text_type, string_types, u
+from six import text_type, string_types, u
class QueryString(text_type):
diff --git a/urlobject/urlobject.py b/urlobject/urlobject.py
index 8aa0170..880dd77 100644
--- a/urlobject/urlobject.py
+++ b/urlobject/urlobject.py
@@ -3,7 +3,7 @@ from .netloc import Netloc
from .path import URLPath, path_encode, path_decode
from .ports import DEFAULT_PORTS
from .query_string import QueryString
-from .six import text_type, u
+from six import text_type, u
class URLObject(text_type):