mercurial: comparison mercurial/windows.py

equal deleted inserted replaced

-:e8ea403b1c46
+:288de6f5d724
 #  Copyright 2005-2009 Olivia Mackall <olivia@selenic.com> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
-from __future__ import absolute_import
 import errno
 import getpass
-import msvcrt
+import msvcrt  # pytype: disable=import-error
 import os
 import re
 import stat
 import string
 import sys
+import winreg  # pytype: disable=import-error
 from .i18n import _
 from .pycompat import getattr
 from . import (
 encoding,
 policy,
 pycompat,
 win32,
 )
-try:
-import _winreg as winreg  # pytype: disable=import-error
-winreg.CloseKey
-except ImportError:
-# py2 only
-import winreg  # pytype: disable=import-error
 osutil = policy.importmod('osutil')
 getfsmountpoint = win32.getvolumename
 getfstype = win32.getfstype
 unlink = win32.unlink
 umask = 0o022
-class mixedfilemodewrapper(object):
+class mixedfilemodewrapper:
 """Wraps a file handle when it is opened in read/write mode.
 fopen() and fdopen() on Windows have a specific-to-Windows requirement
 that files opened with mode r+, w+, or a+ make a call to a file positioning
 function when switching between reads and writes. Without this extra call,
 object.__setattr__(self, '_lastop', self.OPREAD)
 return self._fp.readlines(*args, **kwargs)
-class fdproxy(object):
+class fdproxy:
 """Wraps osutil.posixfile() to override the name attribute to reflect the
 underlying file name.
 """
 def __init__(self, name, fp):
 try:
 fp = osutil.posixfile(name, mode, buffering)  # may raise WindowsError
 # PyFile_FromFd() ignores the name, and seems to report fp.name as the
 # underlying file descriptor.
-if pycompat.ispy3:
+fp = fdproxy(name, fp)
-fp = fdproxy(name, fp)
 # The position when opening in append mode is implementation defined, so
 # make it consistent with other platforms, which position at EOF.
 if b'a' in mode:
 fp.seek(0, os.SEEK_END)
 msvcrt.putwch(u'\r')  # pytype: disable=module-attr
 msvcrt.putwch(u'\n')  # pytype: disable=module-attr
 return encoding.unitolocal(pw)
-class winstdout(object):
+class winstdout:
 """Some files on Windows misbehave.
 When writing to a broken pipe, EINVAL instead of EPIPE may be raised.
 When writing too many bytes to a console at the same, a "Not enough space"
 error may happen. Python 3 already works around that.
 """
 def __init__(self, fp):
 self.fp = fp
-self.throttle = not pycompat.ispy3 and _isatty(fp)
 def __getattr__(self, key):
 return getattr(self.fp, key)
 def close(self):
 except IOError:
 pass
 def write(self, s):
 try:
-if not self.throttle:
+return self.fp.write(s)
-return self.fp.write(s)
-# This is workaround for "Not enough space" error on
-# writing large size of data to console.
-limit = 16000
-l = len(s)
-start = 0
-while start < l:
-end = start + limit
-self.fp.write(s[start:end])
-start = end
 except IOError as inst:
 if inst.errno != 0 and not win32.lasterrorwaspipeerror(inst):
 raise
 self.close()
 raise IOError(errno.EPIPE, 'Broken pipe')
 dmap = {
 normcase(n): s
 for n, k, s in listdir(dir, True)
 if getkind(s.st_mode) in _wantedkinds
 }
-except OSError as err:
+except (FileNotFoundError, NotADirectoryError):
-# Python >= 2.5 returns ENOENT and adds winerror field
-# EINVAL is raised if dir is not a directory.
-if err.errno not in (errno.ENOENT, errno.EINVAL, errno.ENOTDIR):
-raise
 dmap = {}
 cache = dircache.setdefault(dir, dmap)
 yield cache.get(base, None)
 def rename(src, dst):
 '''atomically rename file src to dst, replacing dst if it exists'''
 try:
 os.rename(src, dst)
-except OSError as e:
+except FileExistsError:
-if e.errno != errno.EEXIST:
-raise
 unlink(dst)
 os.rename(src, dst)
 def gethgcmd():
 def isexec(f):
 return False
-class cachestat(object):
+class cachestat:
 def __init__(self, path):
 pass
 def cacheable(self):
 return False
 scope: optionally specify scope for registry lookup, this can be
 a sequence of scopes to look up in order. Default (CURRENT_USER,
 LOCAL_MACHINE).
 """
 if scope is None:
+# pytype: disable=module-attr
 scope = (winreg.HKEY_CURRENT_USER, winreg.HKEY_LOCAL_MACHINE)
+# pytype: enable=module-attr
 elif not isinstance(scope, (list, tuple)):
 scope = (scope,)
 for s in scope:
 try:
+# pytype: disable=module-attr
 with winreg.OpenKey(s, encoding.strfromlocal(key)) as hkey:
-name = valname and encoding.strfromlocal(valname) or valname
+# pytype: enable=module-attr
+name = None
+if valname is not None:
+name = encoding.strfromlocal(valname)
+# pytype: disable=module-attr
 val = winreg.QueryValueEx(hkey, name)[0]
+# pytype: enable=module-attr
 # never let a Unicode string escape into the wild
 return encoding.unitolocal(val)
 except EnvironmentError:
 pass

branch	stable
changeset 49366	288de6f5d724
parent 49319	a75b530cfc29
child 49518	805419729e11