Revert back to 3.6.0, buildbots do not want chocolate for 04-01

Include/patchlevel.h

@@ -16,14 +16,14 @@
 
 /* Version parsed out into numeric values */
 /*--start constants--*/
-#define PY_MAJOR_VERSION	8
-#define PY_MINOR_VERSION	0
+#define PY_MAJOR_VERSION	3
+#define PY_MINOR_VERSION	6
 #define PY_MICRO_VERSION	0
 #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_ALPHA
 #define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"8.0.0a0"
+#define PY_VERSION      	"3.6.0a0"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

Lib/site.py

@@ -623,59 +623,3 @@ def _script():
 
 if __name__ == '__main__':
     _script()
-
-
-def no_chocolate():
-    import io
-    import pep8
-    import random
-    import shutil
-    import tokenize
-
-    _builtin_compile = builtins.compile
-    words = ('chocolate', 'glory', 'fun', 'spam', 'love', 'guts')
-    pep8style = pep8.StyleGuide()
-
-    def compile_pep8(source, filename, mode, **kw):
-        name = os.path.splitext(os.path.basename(filename))[0]
-        if not name.endswith('_noqa'):
-            bio = io.BytesIO(source)
-            encoding = tokenize.detect_encoding(bio.readline)[0]
-            lines = source.decode(encoding).splitlines(True)
-
-            report = pep8.StandardReport(options=pep8style.options)
-            checker = pep8.Checker(filename, lines,
-                                   report=report,
-                                   options=pep8style.options)
-            checker.check_all()
-            if report.total_errors:
-                word = random.choice(words)
-                raise ImportError("no pep8, no %s" % word)
-        return _builtin_compile(source, filename, mode, **kw)
-
-    builtins.compile = compile_pep8
-
-    # remove precompiled .pyc created during the bootstrap,
-    # to run PEP 8 checks on .py files
-    libdir_cache = os.path.join(os.path.dirname(__file__), '__pycache__')
-    try:
-        shutil.rmtree(libdir_cache)
-    except:
-        pass
-
-    for name in sorted(sys.modules):
-        # Minimum to be able to import modules
-        if name in {'builtins', 'importlib._bootstrap',
-                    'importlib._bootstrap_external', 'importlib',
-                    'importlib.machinery', '__main__', 'io', 'sys', 'site'}:
-            continue
-        del sys.modules[name]
-
-
-try:
-    import _ssl
-except ImportError:
-    # Python not bootstraped yet
-    pass
-else:
-    no_chocolate()