bunch of smaller python error related fixes in TimeModuleBuiltins

Author: tomasstupka

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TimeModuleBuiltins.java

@@ -77,6 +77,7 @@
 import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -521,8 +522,8 @@ protected static int[] checkStructtime(PTuple time,
                         CastToJavaIntExactNode toJavaIntExact,
                         PRaiseNode raise) {
             Object[] otime = getInternalObjectArrayNode.execute(time.getSequenceStorage());
-            if (lenNode.execute(time.getSequenceStorage()) < 9) {
-                throw raise.raise(TypeError, ErrorMessages.FUNC_TAKES_AT_LEAST_D_ARGS, 9, otime.length);
+            if (lenNode.execute(time.getSequenceStorage()) != 9) {
+                throw raise.raise(TypeError, ErrorMessages.S_ILLEGAL_TIME_TUPLE_ARG, "asctime()");
             }
             int[] date = new int[9];
             for (int i = 0; i < 9; i++) {
@@ -531,7 +532,7 @@ protected static int[] checkStructtime(PTuple time,
 
             // This is specific to java
             if (date[TM_YEAR] < Year.MIN_VALUE || date[TM_YEAR] > Year.MAX_VALUE) {
-                throw raise.raise(ValueError, "year out of range");
+                throw raise.raise(OverflowError, "year out of range");
             }
 
             if (date[TM_MON] == 0) {
@@ -817,6 +818,9 @@ private static String format(String format, int[] date) {
 
         @Specialization
         public String formatTime(String format, @SuppressWarnings("unused") PNone time) {
+            if (format.indexOf(0) > -1) {
+                throw raise(PythonBuiltinClassType.ValueError, ErrorMessages.EMBEDDED_NULL_CHARACTER);
+            }
             return format(format, getIntLocalTimeStruct((long) timeSeconds()));
         }
 
@@ -826,6 +830,9 @@ public String formatTime(String format, PTuple time,
                         @Cached SequenceStorageNodes.LenNode lenNode,
                         @CachedLibrary(limit = "1") PythonObjectLibrary lib,
                         @Cached CastToJavaIntExactNode castToInt) {
+            if (format.indexOf(0) > -1) {
+                throw raise(PythonBuiltinClassType.ValueError, ErrorMessages.EMBEDDED_NULL_CHARACTER);
+            }
             int[] date = checkStructtime(time, getArray, lenNode, lib, castToInt, getRaiseNode());
             return format(format, date);
         }
@@ -921,6 +928,11 @@ public String localtime(PTuple time,
             return format(StrfTimeNode.checkStructtime(time, getArray, lenNode, asPIntLib, toJavaIntExact, getRaiseNode()));
         }
 
+        @Fallback
+        public Object localtime(@SuppressWarnings("unused") Object time) {
+            throw raise(TypeError, ErrorMessages.TUPLE_OR_STRUCT_TIME_ARG_REQUIRED);
+        }
+
         protected static String format(int[] tm) {
             return format(CTIME_FORMAT, tm);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -285,6 +285,7 @@ public abstract class ErrorMessages {
     public static final String ILLEGAL_EXPRESSION_FOR_AUGMENTED_ASSIGNEMNT = "illegal expression for augmented assignment";
     public static final String ILLEGAL_IP_STRING_PASSED_TO = "illegal IP address string passed to %s";
     public static final String ILLEGAL_SOCKET_ADDR_ARG = "%s: illegal sockaddr argument";
+    public static final String S_ILLEGAL_TIME_TUPLE_ARG = "%s: illegal time tuple argument";
     public static final String IMPORT_STAR_ONLY_ALLOWED_AT_MODULE_LEVEL = "import * only allowed at module level";
     public static final String INCOMPLETE_FORMAT = "incomplete format";
     public static final String INDEX_NOT_INT = "%s: index not int";
@@ -507,6 +508,7 @@ public abstract class ErrorMessages {
     public static final String RETURNED_NULL_WO_SETTING_ERROR = "%s returned NULL without setting an error";
     public static final String RETURNED_RESULT_WITH_ERROR_SET = "%s returned a result with an error set";
     public static final String RETURNED_UNEXPECTE_RET_CODE_EXPECTED_INT_BUT_WAS_S = "%s returned an unexpected return code; expected 'int' but was %s";
+    public static final String EMBEDDED_NULL_CHARACTER = "embedded null character";
     public static final String S_EMBEDDED_NULL_CHARACTER_IN_S = "%sembedded null character in %s";
     public static final String S_MUST_BE_S = "%s must be %s";
     public static final String S_NOT_SUPPORTED = "%s not supported";