Merge lp:~gz/brz/farewell_98 into lp:brz

[Martin Packman]

Remove old win32 platform code

Remove old and unneeded win32 platform code.

Doesn't go as far as ripping out pywintypes yet, can tackle that later.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/lock.py'
--- breezy/lock.py	2017-05-22 00:56:52 +0000
+++ breezy/lock.py	2017-06-05 23:56:54 +0000
@@ -345,12 +345,7 @@
 
 
 if have_pywin32 and sys.platform == 'win32':
-    if os.path.supports_unicode_filenames:
-        # for Windows NT/2K/XP/etc
-        win32file_CreateFile = win32file.CreateFileW
-    else:
-        # for Windows 98
-        win32file_CreateFile = win32file.CreateFile
+    win32file_CreateFile = win32file.CreateFileW
 
     class _w32c_FileLock(_OSLock):
 
@@ -423,19 +418,12 @@
     from ctypes.wintypes import DWORD, LPCSTR, LPCWSTR
     LPSECURITY_ATTRIBUTES = ctypes.c_void_p # used as NULL no need to declare
     HANDLE = ctypes.c_int # rather than unsigned as in ctypes.wintypes
-    if os.path.supports_unicode_filenames:
-        _function_name = "CreateFileW"
-        LPTSTR = LPCWSTR
-    else:
-        _function_name = "CreateFileA"
-        class LPTSTR(LPCSTR):
-            def __new__(cls, obj):
-                return LPCSTR.__new__(cls, obj.encode("mbcs"))
+    _function_name = "CreateFileW"
 
     # CreateFile <http://msdn.microsoft.com/en-us/library/aa363858.aspx>
     _CreateFile = ctypes.WINFUNCTYPE(
             HANDLE,                # return value
-            LPTSTR,                # lpFileName
+            LPWSTR,                # lpFileName
             DWORD,                 # dwDesiredAccess
             DWORD,                 # dwShareMode
             LPSECURITY_ATTRIBUTES, # lpSecurityAttributes

=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2017-06-02 23:43:00 +0000
+++ breezy/osutils.py	2017-06-05 23:56:54 +0000
@@ -375,33 +375,6 @@
     return _win32_fixdrive(ntpath.abspath(unicode(path)).replace('\\', '/'))
 
 
-def _win98_abspath(path):
-    """Return the absolute version of a path.
-    Windows 98 safe implementation (python reimplementation
-    of Win32 API function GetFullPathNameW)
-    """
-    # Corner cases:
-    #   C:\path     => C:/path
-    #   C:/path     => C:/path
-    #   \\HOST\path => //HOST/path
-    #   //HOST/path => //HOST/path
-    #   path        => C:/cwd/path
-    #   /path       => C:/path
-    path = unicode(path)
-    # check for absolute path
-    drive = ntpath.splitdrive(path)[0]
-    if drive == '' and path[:2] not in('//','\\\\'):
-        cwd = _getcwd()
-        # we cannot simply os.path.join cwd and path
-        # because os.path.join('C:','/path') produce '/path'
-        # and this is incorrect
-        if path[:1] in ('/','\\'):
-            cwd = ntpath.splitdrive(cwd)[0]
-            path = path[1:]
-        path = cwd + '\\' + path
-    return _win32_fixdrive(ntpath.normpath(path).replace('\\', '/'))
-
-
 def _win32_realpath(path):
     # Real ntpath.realpath doesn't have a problem with a unicode cwd
     return _win32_fixdrive(ntpath.realpath(unicode(path)).replace('\\', '/'))
@@ -503,10 +476,7 @@
 
 
 if sys.platform == 'win32':
-    if win32utils.winver == 'Windows 98':
-        abspath = _win98_abspath
-    else:
-        abspath = _win32_abspath
+    abspath = _win32_abspath
     realpath = _win32_realpath
     pathjoin = _win32_pathjoin
     normpath = _win32_normpath
@@ -1836,12 +1806,7 @@
     """
     global _selected_dir_reader
     if _selected_dir_reader is None:
-        if sys.platform == "win32" and win32utils.winver == 'Windows NT':
-            # Win98 doesn't have unicode apis like FindFirstFileW
-            # TODO: We possibly could support Win98 by falling back to the
-            #       original FindFirstFile, and using TCHAR instead of WCHAR,
-            #       but that gets a bit tricky, and requires custom compiling
-            #       for win98 anyway.
+        if sys.platform == "win32":
             try:
                 from ._walkdirs_win32 import Win32ReadDir
                 _selected_dir_reader = Win32ReadDir()

=== modified file 'breezy/tests/test_osutils.py'
--- breezy/tests/test_osutils.py	2017-05-30 21:00:24 +0000
+++ breezy/tests/test_osutils.py	2017-06-05 23:56:54 +0000
@@ -971,23 +971,6 @@
         self.assertEqual('H:/foo', osutils._win32_fixdrive('H:/foo'))
         self.assertEqual('C:\\foo', osutils._win32_fixdrive('c:\\foo'))
 
-    def test_win98_abspath(self):
-        self.requireFeature(features.win32_feature)
-        # absolute path
-        self.assertEqual('C:/foo', osutils._win98_abspath('C:\\foo'))
-        self.assertEqual('C:/foo', osutils._win98_abspath('C:/foo'))
-        # UNC path
-        self.assertEqual('//HOST/path', osutils._win98_abspath(r'\\HOST\path'))
-        self.assertEqual('//HOST/path', osutils._win98_abspath('//HOST/path'))
-        # relative path
-        cwd = osutils.getcwd().rstrip('/')
-        drive = osutils.ntpath.splitdrive(cwd)[0]
-        self.assertEqual(cwd+'/path', osutils._win98_abspath('path'))
-        self.assertEqual(drive+'/path', osutils._win98_abspath('/path'))
-        # unicode path
-        u = u'\u1234'
-        self.assertEqual(cwd+'/'+u, osutils._win98_abspath(u))
-
 
 class TestWin32FuncsDirs(tests.TestCaseInTempDir):
     """Test win32 functions that create files."""
@@ -1230,7 +1213,6 @@
             self.skipTest("Lack filesystem that preserves arbitrary bytes")
 
         self._save_platform_info()
-        win32utils.winver = None # Avoid the win32 detection code
         osutils._fs_enc = 'UTF-8'
 
         # this should raise on error
@@ -1295,7 +1277,6 @@
             dirblock[:] = new_dirblock
 
     def _save_platform_info(self):
-        self.overrideAttr(win32utils, 'winver')
         self.overrideAttr(osutils, '_fs_enc')
         self.overrideAttr(osutils, '_selected_dir_reader')
 
@@ -1310,7 +1291,6 @@
     def test_force_walkdirs_utf8_fs_utf8(self):
         self.requireFeature(UTF8DirReaderFeature)
         self._save_platform_info()
-        win32utils.winver = None # Avoid the win32 detection code
         osutils._fs_enc = 'utf-8'
         self.assertDirReaderIs(
             UTF8DirReaderFeature.module.UTF8DirReader)
@@ -1318,14 +1298,12 @@
     def test_force_walkdirs_utf8_fs_ascii(self):
         self.requireFeature(UTF8DirReaderFeature)
         self._save_platform_info()
-        win32utils.winver = None # Avoid the win32 detection code
         osutils._fs_enc = 'ascii'
         self.assertDirReaderIs(
             UTF8DirReaderFeature.module.UTF8DirReader)
 
     def test_force_walkdirs_utf8_fs_latin1(self):
         self._save_platform_info()
-        win32utils.winver = None # Avoid the win32 detection code
         osutils._fs_enc = 'iso-8859-1'
         self.assertDirReaderIs(osutils.UnicodeDirReader)
 
@@ -1333,16 +1311,9 @@
         # Disabled because the thunk of the whole walkdirs api is disabled.
         self.requireFeature(test__walkdirs_win32.win32_readdir_feature)
         self._save_platform_info()
-        win32utils.winver = 'Windows NT'
         from .._walkdirs_win32 import Win32ReadDir
         self.assertDirReaderIs(Win32ReadDir)
 
-    def test_force_walkdirs_utf8_98(self):
-        self.requireFeature(test__walkdirs_win32.win32_readdir_feature)
-        self._save_platform_info()
-        win32utils.winver = 'Windows 98'
-        self.assertDirReaderIs(osutils.UnicodeDirReader)
-
     def test_unicode_walkdirs(self):
         """Walkdirs should always return unicode paths."""
         self.requireFeature(features.UnicodeFilenameFeature)

=== modified file 'breezy/tests/test_urlutils.py'
--- breezy/tests/test_urlutils.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_urlutils.py	2017-06-05 23:56:54 +0000
@@ -737,9 +737,6 @@
         self.assertEndsWith(url, '/mytest')
 
     def test_non_ascii(self):
-        if win32utils.winver == 'Windows 98':
-            raise TestSkipped('Windows 98 cannot handle unicode filenames')
-
         try:
             os.mkdir(u'dod\xe9')
         except UnicodeError:

=== modified file 'breezy/tests/test_win32utils.py'
--- breezy/tests/test_win32utils.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_win32utils.py	2017-06-05 23:56:54 +0000
@@ -188,54 +188,9 @@
         self.assertEqual('not-existing', p)
 
 
-class TestLocations(TestCase):
-    """Tests for windows specific path and name retrieving functions"""
-
-    def test__ensure_unicode_deprecated(self):
-        s = "text"
-        u1 = self.applyDeprecated(symbol_versioning.deprecated_in((2, 5, 0)),
-            win32utils._ensure_unicode, s)
-        self.assertEqual(s, u1)
-        self.assertIsInstance(u1, unicode)
-        u2 = self.applyDeprecated(symbol_versioning.deprecated_in((2, 5, 0)),
-            win32utils._ensure_unicode, u1)
-        self.assertIs(u1, u2)
-    
-    def test_appdata_unicode_deprecated(self):
-        self.overrideEnv("APPDATA", "fakepath")
-        s = win32utils.get_appdata_location()
-        u = self.applyDeprecated(symbol_versioning.deprecated_in((2, 5, 0)),
-            win32utils.get_appdata_location_unicode)
-        self.assertEqual(s, u)
-        self.assertIsInstance(s, unicode)
-
-    def test_home_unicode_deprecated(self):
-        s = win32utils.get_home_location()
-        u = self.applyDeprecated(symbol_versioning.deprecated_in((2, 5, 0)),
-            win32utils.get_home_location_unicode)
-        self.assertEqual(s, u)
-        self.assertIsInstance(s, unicode)
-
-    def test_user_unicode_deprecated(self):
-        self.overrideEnv("USERNAME", "alien")
-        s = win32utils.get_user_name()
-        u = self.applyDeprecated(symbol_versioning.deprecated_in((2, 5, 0)),
-            win32utils.get_user_name_unicode)
-        self.assertEqual(s, u)
-        self.assertIsInstance(s, unicode)
-
-    def test_host_unicode_deprecated(self):
-        self.overrideEnv("COMPUTERNAME", "alienbox")
-        s = win32utils.get_host_name()
-        u = self.applyDeprecated(symbol_versioning.deprecated_in((2, 5, 0)),
-            win32utils.get_host_name_unicode)
-        self.assertEqual(s, u)
-        self.assertIsInstance(s, unicode)
-
-
 class TestLocationsCtypes(TestCase):
 
-    _test_needs_features = [CtypesFeature]
+    _test_needs_features = [CtypesFeature, features.win32_feature]
 
     def assertPathsEqual(self, p1, p2):
         # TODO: The env var values in particular might return the "short"

=== modified file 'breezy/win32utils.py'
--- breezy/win32utils.py	2017-05-22 00:56:52 +0000
+++ breezy/win32utils.py	2017-06-05 23:56:54 +0000
@@ -29,37 +29,9 @@
 
 from breezy import (
     cmdline,
-    symbol_versioning,
     )
 from breezy.i18n import gettext
 
-# Windows version
-if sys.platform == 'win32':
-    _major,_minor,_build,_platform,_text = sys.getwindowsversion()
-    # from MSDN:
-    # dwPlatformId
-    #   The operating system platform.
-    #   This member can be one of the following values.
-    #   ==========================  ======================================
-    #   Value                       Meaning
-    #   --------------------------  --------------------------------------
-    #   VER_PLATFORM_WIN32_NT       The operating system is Windows Vista,
-    #   2                           Windows Server "Longhorn",
-    #                               Windows Server 2003, Windows XP,
-    #                               Windows 2000, or Windows NT.
-    #
-    #   VER_PLATFORM_WIN32_WINDOWS  The operating system is Windows Me,
-    #   1                           Windows 98, or Windows 95.
-    #   ==========================  ======================================
-    if _platform == 2:
-        winver = 'Windows NT'
-    else:
-        # don't care about real Windows name, just to force safe operations
-        winver = 'Windows 98'
-else:
-    winver = None
-
-
 # We can cope without it; use a separate variable to help pyflakes
 try:
     import ctypes
@@ -67,15 +39,9 @@
 except ImportError:
     has_ctypes = False
 else:
-    if winver == 'Windows 98':
-        create_buffer = ctypes.create_string_buffer
-        def extract_buffer(buf):
-            return buf.value.decode("mbcs")
-        suffix = 'A'
-    else:
-        create_buffer = ctypes.create_unicode_buffer
-        extract_buffer = operator.attrgetter("value")
-        suffix = 'W'
+    create_buffer = ctypes.create_unicode_buffer
+    extract_buffer = operator.attrgetter("value")
+    suffix = 'W'
 try:
     import pywintypes
     has_pywintypes = True
@@ -372,28 +338,6 @@
     return get_environ_unicode('COMPUTERNAME')
 
 
-@symbol_versioning.deprecated_function(
-    symbol_versioning.deprecated_in((2, 5, 0)))
-def _ensure_unicode(s):
-    if s and not isinstance(s, unicode):
-        from . import osutils
-        s = s.decode(osutils.get_user_encoding())
-    return s
-
-
-get_appdata_location_unicode = symbol_versioning.deprecated_function(
-    symbol_versioning.deprecated_in((2, 5, 0)))(get_appdata_location)
-
-get_home_location_unicode = symbol_versioning.deprecated_function(
-    symbol_versioning.deprecated_in((2, 5, 0)))(get_home_location)
-
-get_user_name_unicode = symbol_versioning.deprecated_function(
-    symbol_versioning.deprecated_in((2, 5, 0)))(get_user_name)
-
-get_host_name_unicode = symbol_versioning.deprecated_function(
-    symbol_versioning.deprecated_in((2, 5, 0)))(get_host_name)
-
-
 def _ensure_with_dir(path):
     if (not os.path.split(path)[0] or path.startswith(u'*')
         or path.startswith(u'?')):
@@ -491,10 +435,7 @@
 def set_file_attr_hidden(path):
     """Set file attributes to hidden if possible"""
     if has_win32file:
-        if winver != 'Windows 98':
-            SetFileAttributes = win32file.SetFileAttributesW
-        else:
-            SetFileAttributes = win32file.SetFileAttributes
+        SetFileAttributes = win32file.SetFileAttributesW
         try:
             SetFileAttributes(path, win32file.FILE_ATTRIBUTE_HIDDEN)
         except pywintypes.error as e:
@@ -543,7 +484,7 @@
     return args
 
 
-if has_ctypes and winver == 'Windows NT':
+if has_ctypes:
     def get_unicode_argv():
         prototype = ctypes.WINFUNCTYPE(ctypes.c_wchar_p)
         GetCommandLineW = prototype(("GetCommandLineW",
@@ -554,7 +495,7 @@
         # Skip the first argument, since we only care about parameters
         argv = _command_line_to_argv(command_line, sys.argv)[1:]
         return argv
-    
+
 
     def get_environ_unicode(key, default=None):
         """Get `key` from environment as unicode or `default` if unset
@@ -587,18 +528,6 @@
             if buffer_size > length:
                 return buffer[:length]
             buffer_size = length
-else:
-    get_unicode_argv = None
-    def get_environ_unicode(key, default=None):
-        """Get `key` from environment as unicode or `default` if unset
-
-        Fallback version that should basically never be needed.
-        """
-        from breezy import osutils
-        try:
-            return os.environ[key].decode(osutils.get_user_encoding())
-        except KeyError:
-            return default
 
 
 if has_win32api: