Remove _Flavour, _WindowsFlavour and _PosixFlavour

Author: barneygale

Lib/pathlib.py

@@ -46,25 +46,6 @@ def _is_wildcard_pattern(pat):
     return "*" in pat or "?" in pat or "[" in pat
 
 
-class _Flavour(object):
-    """A flavour implements a particular (platform-specific) set of path
-    semantics."""
-
-
-class _WindowsFlavour(_Flavour):
-    # Reference for Windows paths can be found at
-    # http://msdn.microsoft.com/en-us/library/aa365247%28v=vs.85%29.aspx
-    pass
-
-
-class _PosixFlavour(_Flavour):
-    pass
-
-
-_windows_flavour = _WindowsFlavour()
-_posix_flavour = _PosixFlavour()
-
-
 class _Accessor:
     """An accessor implements a particular (system-specific or not) way of
     accessing paths on the filesystem."""
@@ -516,9 +497,9 @@ def _cparts(self):
             return self._cached_cparts
 
     def __eq__(self, other):
-        if not isinstance(other, PurePath):
+        if not isinstance(other, type(self)):
             return NotImplemented
-        return self._cparts == other._cparts and self._flavour is other._flavour
+        return self._cparts == other._cparts
 
     def __hash__(self):
         try:
@@ -528,22 +509,22 @@ def __hash__(self):
             return self._hash
 
     def __lt__(self, other):
-        if not isinstance(other, PurePath) or self._flavour is not other._flavour:
+        if not isinstance(other, type(self)):
             return NotImplemented
         return self._cparts < other._cparts
 
     def __le__(self, other):
-        if not isinstance(other, PurePath) or self._flavour is not other._flavour:
+        if not isinstance(other, type(self)):
             return NotImplemented
         return self._cparts <= other._cparts
 
     def __gt__(self, other):
-        if not isinstance(other, PurePath) or self._flavour is not other._flavour:
+        if not isinstance(other, type(self)):
             return NotImplemented
         return self._cparts > other._cparts
 
     def __ge__(self, other):
-        if not isinstance(other, PurePath) or self._flavour is not other._flavour:
+        if not isinstance(other, type(self)):
             return NotImplemented
         return self._cparts >= other._cparts
 
@@ -779,7 +760,6 @@ class PurePosixPath(PurePath):
     On a POSIX system, instantiating a PurePath should return this object.
     However, you can also instantiate it directly on any system.
     """
-    _flavour = _posix_flavour
     _pathmod = posixpath
     _supported = (os.name != 'nt')
     _case_insensitive = False
@@ -823,7 +803,8 @@ class PureWindowsPath(PurePath):
     On a Windows system, instantiating a PurePath should return this object.
     However, you can also instantiate it directly on any system.
     """
-    _flavour = _windows_flavour
+    # Reference for Windows paths can be found at
+    # http://msdn.microsoft.com/en-us/library/aa365247%28v=vs.85%29.aspx
     _pathmod = ntpath
     _supported = (os.name == 'nt')
     _case_insensitive = True

Lib/test/test_pathlib.py

@@ -45,7 +45,6 @@ class _BasePurePathTest(object):
 
     def setUp(self):
         p = self.cls('a')
-        self.flavour = p._flavour
         self.sep = p._pathmod.sep
         self.altsep = p._pathmod.altsep
 
@@ -1290,12 +1289,12 @@ def test_concrete_class(self):
         self.assertIs(type(p),
             pathlib.PureWindowsPath if os.name == 'nt' else pathlib.PurePosixPath)
 
-    def test_different_flavours_unequal(self):
+    def test_different_types_unequal(self):
         p = pathlib.PurePosixPath('a')
         q = pathlib.PureWindowsPath('a')
         self.assertNotEqual(p, q)
 
-    def test_different_flavours_unordered(self):
+    def test_different_types_unordered(self):
         p = pathlib.PurePosixPath('a')
         q = pathlib.PureWindowsPath('a')
         with self.assertRaises(TypeError):