[GR-27828] Add integer conversion to os.urandom

PullRequest: graalpython/1437

Author: msimacek

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

@@ -126,6 +126,7 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonUnaryClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.nodes.util.CannotCastException;
@@ -1641,10 +1642,11 @@ private Object rename(VirtualFrame frame, String src, String dst) {
     public abstract static class ReplaceNode extends RenameNode {
     }
 
-    @Builtin(name = "urandom", minNumOfPositionalArgs = 1)
+    @Builtin(name = "urandom", minNumOfPositionalArgs = 1, numOfPositionalOnlyArgs = 1, parameterNames = {"size"})
+    @ArgumentClinic(name = "size", conversion = ClinicConversion.Index, defaultValue = "0")
     @GenerateNodeFactory
     @TypeSystemReference(PythonArithmeticTypes.class)
-    abstract static class URandomNode extends PythonBuiltinNode {
+    abstract static class URandomNode extends PythonUnaryClinicBuiltinNode {
         private static SecureRandom secureRandom;
 
         private static SecureRandom createRandomInstance() {
@@ -1666,9 +1668,9 @@ PBytes urandom(int size) {
             return factory().createBytes(bytes);
         }
 
-        @Fallback
-        Object urandomError(Object size) {
-            throw raise(TypeError, ErrorMessages.ARG_EXPECTED_GOT, "integer", size);
+        @Override
+        protected ArgumentClinicProvider getArgumentClinic() {
+            return PosixModuleBuiltinsClinicProviders.URandomNodeClinicProviderGen.INSTANCE;
         }
     }
 

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

@@ -87,6 +87,7 @@
 public final class TimeModuleBuiltins extends PythonBuiltins {
     private static final int DELAY_NANOS = 10;
     private static final long PERF_COUNTER_START = TruffleOptions.AOT ? 0 : System.nanoTime();
+    private static final String CTIME_FORMAT = "%s %s %2d %02d:%02d:%02d %d";
 
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
@@ -850,16 +851,14 @@ private static long op(int[] integers) {
     @GenerateNodeFactory
     public abstract static class CTimeNode extends PythonBuiltinNode {
 
-        private static final String FORMAT = "%s %s %2d %02d:%02d:%02d %d";
-
         @Specialization
         public String localtime(VirtualFrame frame, Object seconds,
                         @Cached ToLongTime toLongTime) {
             return format(getIntLocalTimeStruct(toLongTime.execute(frame, seconds)));
         }
 
         protected static String format(int[] tm) {
-            return ASCTimeNode.format(FORMAT, tm);
+            return ASCTimeNode.format(CTIME_FORMAT, tm);
         }
     }
 
@@ -868,7 +867,6 @@ protected static String format(int[] tm) {
     @GenerateNodeFactory
     public abstract static class ASCTimeNode extends PythonBuiltinNode {
 
-        private static final String FORMAT = "%s %s %02d %02d:%02d:%02d %d";
         static final String[] WDAY_NAME = new String[]{
                         "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"
         };
@@ -892,7 +890,7 @@ public String localtime(PTuple time,
         }
 
         protected static String format(int[] tm) {
-            return format(FORMAT, tm);
+            return format(CTIME_FORMAT, tm);
         }
 
         @TruffleBoundary