This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7510

windows: suppress pytype warnings for Windows imports and functions
ClosedPublic

Authored by mharbison72 on Nov 23 2019, 12:15 AM.

Details

Reviewers
dlax
indygreg
Group Reviewers
hg-reviewers
Commits
rHGfe73ec69350e: windows: suppress pytype warnings for Windows imports and functions
rHGc6060b243163: windows: suppress pytype warnings for Windows imports and functions
Summary

This should allow the modules to not be excluded, and not generate complaints on
non Windows platforms.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Nov 23 2019, 12:15 AM
mharbison72 added a comment.Nov 23 2019, 12:17 AM

I'm not sure if there are plans to vendor *.pyi files. Maybe that could be used to backfill platform specific modules instead of doing this. But for now is seems better to get the error count and blacklist length reduced.

dlax accepted this revision.Nov 23 2019, 3:39 AM
indygreg added a subscriber: indygreg.Nov 23 2019, 7:58 PM
In D7510#110343, @mharbison72 wrote:

I'm not sure if there are plans to vendor *.pyi files. Maybe that could be used to backfill platform specific modules instead of doing this. But for now is seems better to get the error count and blacklist length reduced.

I think .pyi files are a bit annoying. And since Python 2 support isn't long for this world, I think we should hold out and just switch to inline type annotations as soon as we drop Python 2 support. This assumes we make good on our plan to drop Python 2 after the first release in 2020 at latest. If not, we should consider vendoring .pyi files so we can have nicer things sooner.

indygreg accepted this revision.Nov 23 2019, 7:58 PM
This revision is now accepted and ready to land.Nov 23 2019, 7:58 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/pycompat.py (2 lines)
Mmercurial/scmwindows.py (5 lines)
Mmercurial/windows.py (7 lines)

Diff 18377

mercurial/pycompat.py

import io import io
import struct import struct
if os.name == r'nt' and sys.version_info >= (3, 6): if os.name == r'nt' and sys.version_info >= (3, 6):
# MBCS (or ANSI) filesystem encoding must be used as before. # MBCS (or ANSI) filesystem encoding must be used as before.
# Otherwise non-ASCII filenames in existing repositories would be # Otherwise non-ASCII filenames in existing repositories would be
# corrupted. # corrupted.
# This must be set once prior to any fsencode/fsdecode calls. # This must be set once prior to any fsencode/fsdecode calls.
sys._enablelegacywindowsfsencoding() sys._enablelegacywindowsfsencoding() # pytype: disable=module-attr
fsencode = os.fsencode fsencode = os.fsencode
fsdecode = os.fsdecode fsdecode = os.fsdecode
oscurdir = os.curdir.encode('ascii') oscurdir = os.curdir.encode('ascii')
oslinesep = os.linesep.encode('ascii') oslinesep = os.linesep.encode('ascii')
osname = os.name.encode('ascii') osname = os.name.encode('ascii')
ospathsep = os.pathsep.encode('ascii') ospathsep = os.pathsep.encode('ascii')
ospardir = os.pardir.encode('ascii') ospardir = os.pardir.encode('ascii')

mercurial/scmwindows.py

from __future__ import absolute_import from __future__ import absolute_import
import os import os
from . import ( from . import (
encoding, encoding,
pycompat, pycompat,
util, util,
win32, win32,
) )
try: try:
import _winreg as winreg import _winreg as winreg # pytype: disable=import-error
winreg.CloseKey winreg.CloseKey
except ImportError: except ImportError:
import winreg # py2 only
import winreg # pytype: disable=import-error
# MS-DOS 'more' is the only pager available by default on Windows. # MS-DOS 'more' is the only pager available by default on Windows.
fallbackpager = b'more' fallbackpager = b'more'
def systemrcpath(): def systemrcpath():
'''return default os-specific hgrc search path''' '''return default os-specific hgrc search path'''
rcpath = [] rcpath = []

mercurial/windows.py

encoding, encoding,
error, error,
policy, policy,
pycompat, pycompat,
win32, win32,
) )
try: try:
import _winreg as winreg import _winreg as winreg # pytype: disable=import-error
winreg.CloseKey winreg.CloseKey
except ImportError: except ImportError:
import winreg # py2 only
import winreg # pytype: disable=import-error
osutil = policy.importmod('osutil') osutil = policy.importmod('osutil')
getfsmountpoint = win32.getvolumename getfsmountpoint = win32.getvolumename
getfstype = win32.getfstype getfstype = win32.getfstype
getuser = win32.getuser getuser = win32.getuser
hidewindow = win32.hidewindow hidewindow = win32.hidewindow
makedir = win32.makedir makedir = win32.makedir
return False return False
def setbinary(fd): def setbinary(fd):
# When run without console, pipes may expose invalid # When run without console, pipes may expose invalid
# fileno(), usually set to -1. # fileno(), usually set to -1.
fno = getattr(fd, 'fileno', None) fno = getattr(fd, 'fileno', None)
if fno is not None and fno() >= 0: if fno is not None and fno() >= 0:
msvcrt.setmode(fno(), os.O_BINARY) msvcrt.setmode(fno(), os.O_BINARY) # pytype: disable=module-attr
def pconvert(path): def pconvert(path):
return path.replace(pycompat.ossep, b'/') return path.replace(pycompat.ossep, b'/')
def localpath(path): def localpath(path):
return path.replace(b'/', b'\\') return path.replace(b'/', b'\\')