remove older lib-graalpython things and fix minimal running

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -358,7 +358,6 @@ private static String[] initializeCoreFiles() {
         // Order matters!
         List<String> coreFiles = new ArrayList<>(Arrays.asList(
                         "type",
-                        "function",
                         "__graalpython__",
                         "_weakref",
                         "faulthandler",

graalpython/lib-graalpython/builtins.py

@@ -44,35 +44,73 @@
 def __gr__(self, name, mode='r', closefd=True, opener=None):
     pass
 
-def __bootstrap_import__(filename, module_name):
-    import sys, _imp, posix
-    module = sys.modules[module_name]
-    if filename.startswith("%s"):
-        full_filename = filename % __graalpython__.core_home
-        filename = filename[len("%s"):]
-    elif filename.startswith(__graalpython__.stdlib_home):
-        full_filename = filename
-        filename = filename[len(__graalpython__.stdlib_home):]
-    else:
-        raise RuntimeError("There was an import during bootstrap outside the core or stdlib home.")
-
-    # If we can, avoid opening the file and use our cached code
-    if not __graalpython__.has_cached_code(filename):
-        content = __graalpython__.read_file(full_filename)
-        code = compile(content, filename, "exec")
-    else:
-        # n.b.: for these builtin modules, there's never a full path and none of
-        # them can be packages
-        code = __graalpython__.get_cached_code(filename)
-
-    exec(code, module.__dict__)
-    return module
-
-
-# # TODO(fa): This was formerly located in 'property.py' which has been intrinsified but seemingly other modules rely
-# #  on 'descriptor'. We should revisit that.
+
+# TODO(fa): This was formerly located in 'property.py' which has been intrinsified but seemingly other modules rely
+#  on 'descriptor'. We should revisit that.
 def _f(): pass
 FunctionType = type(_f)
 descriptor = type(FunctionType.__code__)
 
-__bootstrap_import__("%s/functions.py", "builtins")
+
+from sys import _getframe as __getframe__
+
+
+@__graalpython__.builtin
+def vars(*obj):
+    """Return a dictionary of all the attributes currently bound in obj.  If
+    called with no argument, return the variables bound in local scope."""
+    if len(obj) == 0:
+        # TODO inlining _caller_locals().items() in the dict comprehension does not work for now, investigate!
+        return __getframe__(0).f_locals
+    elif len(obj) != 1:
+        raise TypeError("vars() takes at most 1 argument.")
+    try:
+        return obj[0].__dict__
+    except AttributeError:
+        raise TypeError("vars() argument must have __dict__ attribute")
+
+
+@__graalpython__.builtin
+def input(prompt=None):
+    import sys
+    if(not hasattr(sys, "stdin")):
+        raise RuntimeError('input(): lost sys.stdin')
+    if(not hasattr(sys, "stdout")):
+        raise RuntimeError('input(): lost sys.stdout')
+    if(not hasattr(sys, "stderr")):
+        raise RuntimeError('input(): lost sys.stderr')
+
+    if prompt is not None:
+        print(prompt, end="", flush=hasattr(sys.stdout, "flush"))
+
+    result = []
+    while True:
+        ch = sys.stdin.read(1)
+        if ch:
+            if ch == "\n":
+                break
+            result.append(ch)
+        else:
+            if(len(result) == 0):
+                raise EOFError('EOF when reading a line')
+            break
+    return "".join(result)
+
+
+class filter(object):
+    def __init__(self, predicateOrNone, iterable):
+        self.predicateOrNone = predicateOrNone
+        self.iterable = iter(iterable)
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        while True:
+            item = next(self.iterable)
+            if self.predicateOrNone is None:
+                if item:
+                    return item
+            else:
+                if self.predicateOrNone(item):
+                    return item

graalpython/lib-graalpython/functions.py

@@ -140,15 +140,15 @@ def python(args, **kwargs):
     do_run_python(args, **kwargs)
 
 
-def do_run_python(args, extra_vm_args=None, env=None, jdk=None, extra_dists=None, cp_prefix=None, cp_suffix=None, main_class=GRAALPYTHON_MAIN_CLASS, minimal=False, **kwargs):
+def do_run_python(args, extra_vm_args=None, env=None, jdk=None, extra_dists=None, cp_prefix=None, cp_suffix=None, main_class=GRAALPYTHON_MAIN_CLASS, minimal=True, **kwargs):
     experimental_opt_added = False
-    if not any(arg.startswith("--python.CAPI") for arg in args):
+    if not minimal and not any(arg.startswith("--python.CAPI") for arg in args):
         capi_home = _get_capi_home()
         args.insert(0, "--python.CAPI=%s" % capi_home)
         args.insert(0, "--experimental-options")
         experimental_opt_added = True
 
-    if not any(arg.startswith("--python.JNIHome") for arg in args):
+    if not minimal and not any(arg.startswith("--python.JNIHome") for arg in args):
         args.insert(0, "--python.JNIHome=" + _get_jni_home())
         if not experimental_opt_added:
             args.insert(0, "--experimental-options")