Merge branch 'fix-windows-tests'

* fix failing test for backslashed unicode paths on Windows
* fix reading of CIFs from URL-like paths

Author: pavoljuhas

src/diffpy/structure/parsers/p_cif.py

@@ -281,7 +281,7 @@ def parseFile(self, filename):
         """
         self.ciffile = None
         self.filename = filename
-        fileurl = _fixIfWindowsPath(filename)
+        fileurl = _quoteLocalPath(filename)
         rv = self._parseCifDataSource(fileurl)
         # all good here
         return rv
@@ -706,17 +706,30 @@ def getSymOp(s):
     return rv
 
 
-def _fixIfWindowsPath(filename):
-    """Convert Windows-style path to valid local URL.
-    CifFile loads files using urlopen, which fails for Windows-style paths.
+def _quoteLocalPath(filename):
+    """Quote local paths to file URL-s.
 
-    filename -- path to be fixed
+    CifFile reads files with urlopen, which fails for Windows paths or
+    for paths containing ":".
 
-    Return fixed URL when run on Windows, otherwise return filename.
+    Parameters
+    ----------
+    filename : str
+        The path to be corrected.
+
+    Returns
+    -------
+    str
+        The fixed URL when it contains ":" or `filename`.
+        Return filename if it forms http or ftp URL.
     """
     rv = filename
-    if filename[:1].isalpha() and filename[1:3] == ':\\':
-        from urllib.request import pathname2url
+    cnvflag = False
+    if ':' in filename:
+        head = filename.split(':', 1)[0].lower()
+        cnvflag = head.isalpha() and head not in ('http', 'https', 'ftp')
+    if cnvflag:
+        from six.moves.urllib.request import pathname2url
         rv = pathname2url(filename)
     return rv
 

src/diffpy/structure/tests/testp_cif.py

@@ -22,6 +22,7 @@
 
 from diffpy.structure.tests.testutils import datafile
 from diffpy.structure.parsers.p_cif import P_cif, leading_float, getSymOp
+from diffpy.structure.parsers.p_cif import _quoteLocalPath
 from diffpy.structure.parsers import getParser
 from diffpy.structure import Structure
 from diffpy.structure import StructureFormatError
@@ -60,6 +61,18 @@ def test_getSymOp(self):
         self.assertEqual(str(op1_std), str(op1))
         return
 
+
+    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(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'))
+        return
+
 # End of class TestRoutines
 
 # ----------------------------------------------------------------------------
@@ -157,7 +170,11 @@ def test_parseFile(self):
         self.assertEqual(str, type(c1.label))
         self.assertEqual('C1', c1.label)
         # filename with unicode encoding
-        ugraphite = P_cif().parseFile(six.u(self.graphiteciffile))
+        hasbs = '\\' in self.graphiteciffile
+        uciffile = six.u(self.graphiteciffile.replace('\\', '/'))
+        if hasbs:   # pragma: no cover
+            uciffile = uciffile.replace(u'/', u'\\')
+        ugraphite = P_cif().parseFile(uciffile)
         self.assertEqual(4, len(ugraphite))
         # File with full space group name
         ptei = P_cif().parseFile(self.teiciffile)