qpid-python git commit: QPID-2524: Always use the file:// prefix

[jr...@apache.org]

Repository: qpid-python
Updated Branches:
  refs/heads/master 11bc3d7b9 -> 0c7e96af4


QPID-2524: Always use the file:// prefix


Project: http://git-wip-us.apache.org/repos/asf/qpid-python/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-python/commit/0c7e96af
Tree: http://git-wip-us.apache.org/repos/asf/qpid-python/tree/0c7e96af
Diff: http://git-wip-us.apache.org/repos/asf/qpid-python/diff/0c7e96af

Branch: refs/heads/master
Commit: 0c7e96af4e540df26372f8e4dd2f7f1b0a997ffd
Parents: 11bc3d7
Author: Justin Ross <jr...@apache.org>
Authored: Sat Mar 11 12:51:38 2017 -0800
Committer: Justin Ross <jr...@apache.org>
Committed: Sat Mar 11 12:51:38 2017 -0800

----------------------------------------------------------------------
 mllib/__init__.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-python/blob/0c7e96af/mllib/__init__.py
----------------------------------------------------------------------
diff --git a/mllib/__init__.py b/mllib/__init__.py
index af192df..7d0ba99 100644
--- a/mllib/__init__.py
+++ b/mllib/__init__.py
@@ -66,12 +66,7 @@ class Resolver:
     return InputSource(systemId)
 
 def xml_parse(filename, path=()):
-  if sys.version_info[0:2] == (2,3):
-    # XXX: this is for older versions of python
-    from urllib import pathname2url
-    source = "file:%s" % pathname2url( os.path.abspath( filename ) )
-  else:
-    source = filename
+  source = "file://%s" % os.path.abspath(filename)
   h = parsers.XMLParser()
   p = xml.sax.make_parser()
   p.setContentHandler(h)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org