Rename sys to _sys and proxy it.

Author: ericsnowcurrently

Lib/_collections_abc.py

@@ -7,7 +7,7 @@
 """
 
 from abc import ABCMeta, abstractmethod
-import sys
+import _sys as sys  # We use the low-level module during interpreter init.
 
 __all__ = ["Awaitable", "Coroutine",
            "AsyncIterable", "AsyncIterator", "AsyncGenerator",

Lib/_compat_pickle.py

@@ -57,7 +57,7 @@
 NAME_MAPPING = {
     ('__builtin__', 'xrange'):     ('builtins', 'range'),
     ('__builtin__', 'reduce'):     ('functools', 'reduce'),
-    ('__builtin__', 'intern'):     ('sys', 'intern'),
+    ('__builtin__', 'intern'):     ('_sys', 'intern'),
     ('__builtin__', 'unichr'):     ('builtins', 'chr'),
     ('__builtin__', 'unicode'):    ('builtins', 'str'),
     ('__builtin__', 'long'):       ('builtins', 'int'),

Lib/_sitebuiltins.py

@@ -8,7 +8,7 @@
 # Note this means this module should also avoid keep things alive in its
 # globals.
 
-import sys
+import _sys as sys  # We use the low-level module during interpreter init.
 
 class Quitter(object):
     def __init__(self, name, eof):

Lib/codecs.py

@@ -8,7 +8,7 @@
 """
 
 import builtins
-import sys
+import _sys as sys  # We use the low-level module during interpreter init.
 
 ### Registry and builtin stateless codec functions
 

Lib/collections/__init__.py

@@ -25,7 +25,7 @@
 
 from operator import itemgetter as _itemgetter, eq as _eq
 from keyword import iskeyword as _iskeyword
-import sys as _sys
+import _sys  # We use the low-level module during interpreter init.
 import heapq as _heapq
 from _weakref import proxy as _proxy
 from itertools import repeat as _repeat, chain as _chain, starmap as _starmap

Lib/contextlib.py

@@ -1,6 +1,6 @@
 """Utilities for with-statement contexts.  See PEP 343."""
 import abc
-import sys
+import _sys as sys
 import _collections_abc
 from collections import deque
 from functools import wraps

Lib/doctest.py

@@ -209,7 +209,7 @@ def _normalize_module(module, depth=2):
     elif module is None:
         return sys.modules[sys._getframe(depth).f_globals['__name__']]
     else:
-        raise TypeError("Expected a module, string, or None")
+        raise TypeError("Expected a module, string, or None, got {}".format(type(module)))
 
 def _load_testfile(filename, package, module_relative, encoding):
     if module_relative:

Lib/encodings/__init__.py

@@ -29,7 +29,7 @@
 """#"
 
 import codecs
-import sys
+import _sys as sys
 from . import aliases
 
 _cache = {}

Lib/enum.py

@@ -1,4 +1,4 @@
-import sys
+import _sys as sys
 from types import MappingProxyType, DynamicClassAttribute
 from functools import reduce
 from operator import or_ as _or_

Lib/importlib/__init__.py

@@ -10,7 +10,7 @@
 # of a fully initialised version (either the frozen one or the one
 # initialised below if the frozen one is not available).
 import _imp  # Just the builtin component, NOT the full Python module
-import sys
+import _sys as sys
 
 try:
     import _frozen_importlib as _bootstrap