[GR-13591] install pip in venv

timfel · timfel · commit 9f6f49c9b45c · 2019-03-09T04:45:00.000-08:00
PullRequest: graalpython/428
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,17 @@
 This changelog summarizes major changes between GraalVM versions of the Python
 language runtime. The main focus is on user-observable behavior of the engine.
 
+## Version 1.0.0 RC14
+
+* Mark a subset of the Graal Python launcher options as "stable". All other options are subject to change and need to be unlocked explicitly on the commandline.
+* Automatically install pip when creating a venv. The socket and ssl libraries are still not functional, so pip can only install from local sources or wheels.
+* Update the standard library to Python 3.7.0 from 3.6.5.
+* Support the `-I` flag to ignore the user environment and not add the working directory to `sys.path`
+* Fix an error preventing usage of the memtracer tool. If an object raised an exception in it's `__repr__` method, it would abort the execution.
+* Fix issues around not being able to modify function defaults, keyword defaults, or re-defining a function with a different closure.
+* Fix continuation prompt in the interactive Python shell when an incomplete statement was typed. Before it raised and ignored a SyntaxError.
+* Fix frame restarting of Python functions in the Chrome debugger. Before, functions with closures would have their cells accidentally cleared.
+
 ## Version 1.0.0 RC13
 
 * Support marshal.dumps and marshal.loads for code objects and some other built-in objects
diff --git a/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java b/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java
@@ -63,6 +63,7 @@ public static void main(String[] args) {
     private ArrayList<String> programArgs = null;
     private String commandString = null;
     private String inputFile = null;
+    private boolean isolateFlag = false;
     private boolean ignoreEnv = false;
     private boolean inspectFlag = false;
     private boolean verboseFlag = false;
@@ -128,6 +129,11 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                 case "-q":
                     quietFlag = true;
                     break;
+                case "-I":
+                    noUserSite = true;
+                    ignoreEnv = true;
+                    isolateFlag = true;
+                    break;
                 case "-s":
                     noUserSite = true;
                     break;
@@ -231,8 +237,10 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                         break;
                     } else if (!arg.startsWith("--") && arg.length() > 2) {
                         // short arguments can be given together
-                        for (String optionChar : arg.substring(1).split("")) {
-                            arguments.add(i + 1, "-" + optionChar);
+                        String[] split = arg.substring(1).split("");
+                        for (int j = 0; j < split.length; j++) {
+                            String optionChar = split[j];
+                            arguments.add(i + 1 + j, "-" + optionChar);
                         }
                     } else {
                         // possibly a polyglot argument
@@ -396,6 +404,7 @@ protected void launch(Builder contextBuilder) {
         contextBuilder.option("python.AlwaysRunExcepthook", "true");
         contextBuilder.option("python.InspectFlag", Boolean.toString(inspectFlag));
         contextBuilder.option("python.VerboseFlag", Boolean.toString(verboseFlag));
+        contextBuilder.option("python.IsolateFlag", Boolean.toString(isolateFlag));
         if (verboseFlag) {
             contextBuilder.option("log.python.level", "FINE");
         }
@@ -557,6 +566,7 @@ protected void printHelp(OptionCategory maxCategory) {
                         // "-Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n"
                         // +
                         "-q     : don't print version and copyright messages on interactive startup\n" +
+                        "-I     : don't add user site and script directory to sys.path; also PYTHONNOUSERSITE\n" +
                         "-s     : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n" +
                         "-S     : don't imply 'import site' on initialization\n" +
                         // "-t : issue warnings about inconsistent tab usage (-tt: issue errors)\n"
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java
@@ -534,7 +534,8 @@ public static OptionsChecker[] input() {
                             new OptionsChecker("PythonOptimizeFlag", "import sys; sys.flags.debug", "true", "false"),
                             new OptionsChecker("PythonOptimizeFlag", "import sys; sys.flags.optimize", "true", "false"),
                             new OptionsChecker("PythonOptimizeFlag", "__debug__", "true", "false"),
-                            new OptionsChecker("Executable", "import sys; sys.executable", "graalpython", "python3")
+                            new OptionsChecker("Executable", "import sys; sys.executable", "graalpython", "python3"),
+                            new OptionsChecker("IsolateFlag", "import sys; sys.flags.isolated", "true", "false")
             };
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java
@@ -156,6 +156,13 @@ Object doit(PByteArray bytes,
                         @Cached("create()") BytesNodes.ToBytesNode toBytesNode) {
             return marshaller.execute(toBytesNode.execute(bytes), CURRENT_VERSION);
         }
+
+        @SuppressWarnings("unused")
+        @Specialization
+        Object doit(PMemoryView bytes,
+                        @Cached("create()") BytesNodes.ToBytesNode toBytesNode) {
+            return marshaller.execute(toBytesNode.execute(bytes), CURRENT_VERSION);
+        }
     }
 
     private static final char TYPE_NULL = '0';
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java
@@ -1633,6 +1633,11 @@ abstract static class UmaskNode extends PythonBuiltinNode {
         int getAndSetUmask(int umask) {
             if (umask == 0022) {
                 return 0022;
+            }
+            if (umask == 0) {
+                // TODO: change me, this does not really set the umask, workaround needed for pip
+                // it returns the previous mask (which in our case is always 0022)
+                return 0022;
             } else {
                 throw raise(NotImplementedError, "setting the umask to anything other than the default");
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ReadlineModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ReadlineModuleBuiltins.java
@@ -85,6 +85,7 @@ private static final class LocalData implements TruffleObject {
         private final List<String> history = new ArrayList<>();
         protected Object completer = null;
         public boolean autoHistory = true;
+        public String completerDelims = null;
 
         public ForeignAccess getForeignAccess() {
             return null;
@@ -345,4 +346,27 @@ PNone setCompleter(PythonModule self, boolean enabled,
             return PNone.NONE;
         }
     }
+
+    @Builtin(name = "set_completer_delims", minNumOfPositionalArgs = 2, declaresExplicitSelf = true)
+    @GenerateNodeFactory
+    abstract static class SetCompleterDelimsNode extends PythonBinaryBuiltinNode {
+        @Specialization
+        PNone setCompleterDelims(PythonModule self, String completerDelims,
+                        @Cached("create()") ReadAttributeFromObjectNode readNode) {
+            LocalData data = (LocalData) readNode.execute(self, DATA);
+            data.completerDelims = completerDelims;
+            return PNone.NONE;
+        }
+    }
+
+    @Builtin(name = "get_completer_delims", minNumOfPositionalArgs = 1, declaresExplicitSelf = true)
+    @GenerateNodeFactory
+    abstract static class GetCompleterDelimsNode extends PythonBuiltinNode {
+        @Specialization
+        Object getCompleterDelims(PythonModule self,
+                        @Cached("create()") ReadAttributeFromObjectNode readNode) {
+            LocalData data = (LocalData) readNode.execute(self, DATA);
+            return (data.completerDelims != null) ? data.completerDelims : PNone.NONE;
+        }
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java
@@ -180,7 +180,6 @@ public void postInitialize(PythonCore core) {
         sys.setAttribute("graal_python_stdlib_home", PythonOptions.getOption(context, PythonOptions.StdLibHome));
         sys.setAttribute("graal_python_opaque_filesystem", PythonOptions.getOption(context, PythonOptions.OpaqueFilesystem));
         sys.setAttribute("graal_python_opaque_filesystem_prefix", PythonOptions.getOption(context, PythonOptions.OpaqueFilesystemPrefixes));
-        sys.setAttribute("graal_python_unbuffered_io", PythonOptions.getOption(context, PythonOptions.UnbufferedIO));
         sys.setAttribute("__flags__", core.factory().createTuple(new Object[]{
                         false, // bytes_warning
                         !PythonOptions.getFlag(context, PythonOptions.PythonOptimizeFlag), // debug
@@ -189,7 +188,7 @@ public void postInitialize(PythonCore core) {
                         PythonOptions.getFlag(context, PythonOptions.IgnoreEnvironmentFlag), // ignore_environment
                         PythonOptions.getFlag(context, PythonOptions.InspectFlag), // inspect
                         PythonOptions.getFlag(context, PythonOptions.TerminalIsInteractive), // interactive
-                        !context.isExecutableAccessAllowed(), // isolated
+                        PythonOptions.getFlag(context, PythonOptions.IsolateFlag), // isolated
                         PythonOptions.getFlag(context, PythonOptions.NoSiteFlag), // no_site
                         PythonOptions.getFlag(context, PythonOptions.NoUserSiteFlag), // no_user_site
                         PythonOptions.getFlag(context, PythonOptions.PythonOptimizeFlag), // optimize
@@ -203,17 +202,21 @@ public void postInitialize(PythonCore core) {
         String option = PythonOptions.getOption(context, PythonOptions.PythonPath);
         Object[] path;
         int pathIdx = 0;
+        boolean doIsolate = PythonOptions.getOption(context, PythonOptions.IsolateFlag);
+        int defaultPaths = doIsolate ? 2 : 3;
         if (option.length() > 0) {
             String[] split = option.split(PythonCore.PATH_SEPARATOR);
-            path = new Object[split.length + 3];
+            path = new Object[split.length + defaultPaths];
             System.arraycopy(split, 0, path, 0, split.length);
             pathIdx = split.length;
         } else {
-            path = new Object[3];
+            path = new Object[defaultPaths];
         }
-        path[pathIdx] = getScriptPath(env, args);
-        path[pathIdx + 1] = PythonCore.getStdlibHome(env);
-        path[pathIdx + 2] = PythonCore.getCoreHome(env) + PythonCore.FILE_SEPARATOR + "modules";
+        if (!doIsolate) {
+            path[pathIdx++] = getScriptPath(env, args);
+        }
+        path[pathIdx++] = PythonCore.getStdlibHome(env);
+        path[pathIdx++] = PythonCore.getCoreHome(env) + PythonCore.FILE_SEPARATOR + "modules";
         PList sysPaths = core.factory().createList(path);
         sys.setAttribute("path", sysPaths);
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesUtils.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.
@@ -199,13 +199,18 @@ public static StringBuilder decodeEscapes(ParserErrorCallback errors, String str
                     }
                     throw errors.raise(ValueError, "invalid \\x escape at position %d", i);
                 default:
-                    if (regexMode && (chr == '\\' || chr == 'g' || (chr >= '0' && chr <= '9'))) {
-                        // only allow backslashes, named group references and numbered group
-                        // references in regex mode
+                    if (regexMode) {
+                        if (chr == 'g' || (chr >= '0' && chr <= '9')) {
+                            // only allow backslashes, named group references and numbered group
+                            // references in regex mode
+                            charList.append('\\');
+                            charList.append(chr);
+                        } else {
+                            throw errors.raise(ValueError, "invalid escape sequence '\\%s' at position %d", chr, i);
+                        }
+                    } else {
                         charList.append('\\');
                         charList.append(chr);
-                    } else {
-                        throw errors.raise(ValueError, "invalid escape sequence '\\%s' at position %d", chr, i);
                     }
             }
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java
@@ -88,6 +88,9 @@ private PythonOptions() {
     @Option(category = OptionCategory.USER, help = "Equivalent to the Python -u flag. Force stdout and stderr to be unbuffered.", stability = OptionStability.STABLE) //
     public static final OptionKey<Boolean> UnbufferedIO = new OptionKey<>(false);
 
+    @Option(category = OptionCategory.USER, help = "Equivalent to the Python -I flag. Isolate from the users environment by not adding the cwd to the path", stability = OptionStability.STABLE) //
+    public static final OptionKey<Boolean> IsolateFlag = new OptionKey<>(false);
+
     @Option(category = OptionCategory.INTERNAL, help = "Expose internal sources as normal sources, so they will show up in the debugger and stacks") //
     public static final OptionKey<Boolean> ExposeInternalSources = new OptionKey<>(false);
 
diff --git a/graalpython/lib-python/3/platform.py b/graalpython/lib-python/3/platform.py
@@ -161,6 +161,9 @@ def libc_ver(executable=sys.executable, lib='', version='',
         The file is read and scanned in chunks of chunksize bytes.
 
     """
+    if sys.implementation.name == "graalpython":
+        if executable == sys.executable and not os.path.exists(executable):
+            return lib, version
     if hasattr(os.path, 'realpath'):
         # Python 2.2 introduced os.path.realpath(); it is used
         # here to work around problems with Cygwin not being
diff --git a/graalpython/lib-python/3/venv/__init__.py b/graalpython/lib-python/3/venv/__init__.py
@@ -46,11 +46,6 @@ def __init__(self, system_site_packages=False, clear=False,
         self.symlinks = symlinks
         self.upgrade = upgrade
         self.with_pip = with_pip
-        # Truffle change
-        if with_pip:
-            logger.warning("We cannot install pip on Graal Python, yet")
-        self.with_pip = False
-        # End Truffle change
         self.prompt = prompt
 
     def create(self, env_dir):
@@ -119,9 +114,22 @@ def create_if_needed(d):
         context.python_dir = dirname
         context.python_exe = exename
 
+        if sys.platform == 'win32':
+            binname = 'Scripts'
+            incpath = 'Include'
+            libpath = os.path.join(env_dir, 'Lib', 'site-packages')
+        else:
+            binname = 'bin'
+            incpath = 'include'
+            libpath = os.path.join(env_dir, 'lib',
+                                   'python%d.%d' % sys.version_info[:2],
+                                   'site-packages')
+
         # Truffle change: our executable may not just be a file (e.g. we're
         # running through java), we always provide a script for launching in
         # venv
+        exename = context.python_exe = "graalpython"
+
         import atexit, tempfile
         tempdir = tempfile.mkdtemp()
         script = os.path.join(tempdir, "graalpython")
@@ -132,6 +140,13 @@ def create_if_needed(d):
             if sys.platform != "win32":
                 f.write("#!/bin/sh\n")
             f.write(sys.executable)
+            f.write(" --python.CoreHome='%s' --python.StdLibHome='%s' --python.SysPrefix='%s' --python.SysBasePrefix='%s' --python.Executable='%s'" % (
+                sys.graal_python_core_home,
+                sys.graal_python_stdlib_home,
+                context.env_dir,
+                sys.base_prefix,
+                os.path.join(context.env_dir, binname, exename),
+            ))
             if sys.platform == "win32":
                 f.write(" %*")
             else:
@@ -143,24 +158,13 @@ def create_if_needed(d):
         atexit.register(lambda: shutil.rmtree(tempdir, ignore_errors=True))
 
         dirname = context.python_dir = sys.graal_python_home
-        exename = context.python_exe = "graalpython"
         context.executable = script
 
         if self.symlinks:
             logger.warning("We're not using symlinks in a Graal Python venv")
         self.symlinks = False
         # End of Truffle change
 
-        if sys.platform == 'win32':
-            binname = 'Scripts'
-            incpath = 'Include'
-            libpath = os.path.join(env_dir, 'Lib', 'site-packages')
-        else:
-            binname = 'bin'
-            incpath = 'include'
-            libpath = os.path.join(env_dir, 'lib',
-                                   'python%d.%d' % sys.version_info[:2],
-                                   'site-packages')
         context.inc_path = path = os.path.join(env_dir, incpath)
         create_if_needed(path)
         create_if_needed(libpath)
@@ -323,18 +327,6 @@ def replace_variables(self, text, context):
         text = text.replace('__VENV_PROMPT__', context.prompt)
         text = text.replace('__VENV_BIN_NAME__', context.bin_name)
         text = text.replace('__VENV_PYTHON__', context.env_exe)
-        # Truffle change: we need to set some extra options for the launcher to work
-        text = text.replace(
-            '__VENV_GRAAL_PYTHON_OPTIONS__',
-            "--python.CoreHome='%s' --python.StdLibHome='%s' --python.SysPrefix='%s' --python.SysBasePrefix='%s' --python.Executable='%s'" % (
-                sys.graal_python_core_home,
-                sys.graal_python_stdlib_home,
-                context.env_dir,
-                sys.base_prefix,
-                context.env_exe,
-            )
-        )
-        # End truffle change
         return text
 
     def install_scripts(self, context, path):
diff --git a/graalpython/lib-python/3/venv/scripts/common/activate b/graalpython/lib-python/3/venv/scripts/common/activate
@@ -14,14 +14,6 @@ deactivate () {
         unset _OLD_VIRTUAL_PYTHONHOME
     fi
 
-    if [ -n "${_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS:-}" ] ; then
-        GRAAL_PYTHON_OPTIONS="${_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS:-}"
-        export GRAAL_PYTHON_OPTIONS
-        unset _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
-    else
-        unset GRAAL_PYTHON_OPTIONS
-    fi
-
     # This should detect bash and zsh, which have a hash command that must
     # be called to get it to forget past commands.  Without forgetting
     # past commands the $PATH changes we made may not be respected
@@ -52,10 +44,6 @@ _OLD_VIRTUAL_PATH="$PATH"
 PATH="$VIRTUAL_ENV/__VENV_BIN_NAME__:$PATH"
 export PATH
 
-_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS="$GRAAL_PYTHON_OPTIONS"
-GRAAL_PYTHON_OPTIONS="__VENV_GRAAL_PYTHON_OPTIONS__ $GRAAL_PYTHON_OPTIONS"
-export GRAAL_PYTHON_OPTIONS
-
 # unset PYTHONHOME if set
 # this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
 # could use `if (set -u; : $PYTHONHOME) ;` in bash
diff --git a/graalpython/lib-python/3/venv/scripts/nt/Activate.ps1 b/graalpython/lib-python/3/venv/scripts/nt/Activate.ps1
@@ -15,12 +15,6 @@ function global:deactivate ([switch]$NonDestructive) {
         remove-item env:_OLD_VIRTUAL_PATH
     }
 
-    remove-item env:GRAAL_PYTHON_OPTIONS
-    if (Test-Path env:_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS) {
-        copy-item env:_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS env:GRAAL_PYTHON_OPTIONS
-        remove-item env:_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
-    }
-
     if (Test-Path env:VIRTUAL_ENV) {
         remove-item env:VIRTUAL_ENV
     }
@@ -55,6 +49,3 @@ if (Test-Path env:PYTHONHOME) {
 # Add the venv to the PATH
 copy-item env:PATH env:_OLD_VIRTUAL_PATH
 $env:PATH = "$env:VIRTUAL_ENV\__VENV_BIN_NAME__;$env:PATH"
-
-copy-item env:GRAAL_PYTHON_OPTIONS env:_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
-$env:GRAAL_PYTHON_OPTIONS = "$env:__VENV_GRAAL_PYTHON_OPTIONS__ $env:GRAAL_PYTHON_OPTIONS"
diff --git a/graalpython/lib-python/3/venv/scripts/nt/activate.bat b/graalpython/lib-python/3/venv/scripts/nt/activate.bat
@@ -38,14 +38,6 @@ if defined _OLD_VIRTUAL_PATH (
 
 set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"
 
-if defined _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS (
-    set "GRAAL_PYTHON_OPTIONS=%_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS%"
-) else (
-    set "_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS=%GRAAL_PYTHON_OPTIONS%"
-)
-
-set "GRAAL_PYTHON_OPTIONS=__VENV_GRAAL_PYTHON_OPTIONS__ %GRAAL_PYTHON_OPTIONS%"
-
 :END
 if defined _OLD_CODEPAGE (
     "%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul
diff --git a/graalpython/lib-python/3/venv/scripts/nt/deactivate.bat b/graalpython/lib-python/3/venv/scripts/nt/deactivate.bat
diff --git a/graalpython/lib-python/3/venv/scripts/posix/activate.csh b/graalpython/lib-python/3/venv/scripts/posix/activate.csh
diff --git a/graalpython/lib-python/3/venv/scripts/posix/activate.fish b/graalpython/lib-python/3/venv/scripts/posix/activate.fish
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,8 @@ public static OptionsChecker[] input() {`
`534`	`534`	`new OptionsChecker("PythonOptimizeFlag", "import sys; sys.flags.debug", "true", "false"),`
`535`	`535`	`new OptionsChecker("PythonOptimizeFlag", "import sys; sys.flags.optimize", "true", "false"),`
`536`	`536`	`new OptionsChecker("PythonOptimizeFlag", "__debug__", "true", "false"),`
`537`		`- new OptionsChecker("Executable", "import sys; sys.executable", "graalpython", "python3")`
	`537`	`+ new OptionsChecker("Executable", "import sys; sys.executable", "graalpython", "python3"),`
	`538`	`+ new OptionsChecker("IsolateFlag", "import sys; sys.flags.isolated", "true", "false")`
`538`	`539`	`};`
`539`	`540`	`}`
`540`	`541`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,13 @@ Object doit(PByteArray bytes,`
`156`	`156`	`@Cached("create()") BytesNodes.ToBytesNode toBytesNode) {`
`157`	`157`	`return marshaller.execute(toBytesNode.execute(bytes), CURRENT_VERSION);`
`158`	`158`	`}`
	`159`	`+`
	`160`	`+ @SuppressWarnings("unused")`
	`161`	`+ @Specialization`
	`162`	`+ Object doit(PMemoryView bytes,`
	`163`	`+ @Cached("create()") BytesNodes.ToBytesNode toBytesNode) {`
	`164`	`+ return marshaller.execute(toBytesNode.execute(bytes), CURRENT_VERSION);`
	`165`	`+ }`
`159`	`166`	`}`
`160`	`167`
`161`	`168`	`private static final char TYPE_NULL = '0';`