[GR-13918] option -c doesn't work as expected.

PullRequest: graalpython/408

Author: ppisl

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -93,6 +93,7 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                     break;
                 case "-c":
                     i += 1;
+                    programArgs.add(arg);
                     if (i < arguments.size()) {
                         commandString = arguments.get(i);
                     } else {
@@ -182,6 +183,10 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                     subprocessArgs.add("Dgraal.TruffleCompilationExceptionsAreThrown=true");
                     inputArgs.remove("-compile-truffle-immediately");
                     break;
+                case "-u":
+                    // TODO we currently don't support this option, but needs to be consumed
+                    // due pip/wheel installer.
+                    break;
                 default:
                     if (!arg.startsWith("-")) {
                         inputFile = arg;

graalpython/lib-graalpython/exceptions.py

@@ -165,7 +165,7 @@ def OSError__new__(subtype, *args, **kwds):
 def OSError__init__(self, *args, **kwds):
     if (not _oserror_use_init(type(self))):
         return None
-    _oserror_init(self, *arg)
+    _oserror_init(self, *args)
 
 def OSError__str__(self):
     if (self.filename):
@@ -175,7 +175,7 @@ def OSError__str__(self):
             return "[Errno %i] %s: %s" % (self.errno, self.strerror, self.filename)
     if(self.errno and self.strerror):
         return "[Errno %i] %s" % (self.errno, self.strerror)
-    return BaseException.str(self)
+    return BaseException.__str__(self)
 
 OSError.__new__ = OSError__new__
 OSError.__init__ = OSError__init__