remove url parsing through _quoteLocalPath

Author: harripj

src/diffpy/structure/parsers/p_cif.py

@@ -281,8 +281,7 @@ def parseFile(self, filename):
         """
         self.ciffile = None
         self.filename = filename
-        fileurl = _quoteLocalPath(filename)
-        rv = self._parseCifDataSource(fileurl)
+        rv = self._parseCifDataSource(filename)
         # all good here
         return rv
 
@@ -731,8 +730,6 @@ def _quoteLocalPath(filename):
     if cnvflag:
         from six.moves.urllib.request import pathname2url
         rv = pathname2url(filename)
-        if rv.startswith("///"):
-            rv = "file:" + rv
     return rv
 
 

src/diffpy/structure/tests/testp_cif.py

@@ -66,8 +66,8 @@ def test__quoteLocalPath(self):
         "check _quoteLocalPath()"
         from six.moves.urllib.request import pathname2url as p2u
         self.assertEqual('/a/b/c.cif', _quoteLocalPath('/a/b/c.cif'))
-        self.assertEqual('file:' + p2u('c:\\a.cif'), _quoteLocalPath('c:\\a.cif'))
-        self.assertEqual('file:' + p2u('c:/a.cif'), _quoteLocalPath('c:/a.cif'))
+        self.assertEqual(p2u('c:\\a.cif'), _quoteLocalPath('c:\\a.cif'))
+        self.assertEqual(p2u('c:/a.cif'), _quoteLocalPath('c:/a.cif'))
         self.assertEqual('/x:y/c.cif', _quoteLocalPath('/x:y/c.cif'))
         self.assertEqual('http::cif.org/a.cif',
                          _quoteLocalPath('http::cif.org/a.cif'))