[Jython-checkins] SF.net SVN: jython:[7031] trunk/jython/src/org/python/core

[<pj...@us...>]

Revision: 7031
          http://jython.svn.sourceforge.net/jython/?rev=7031&view=rev
Author:   pjenvey
Date:     2010-04-17 16:51:11 +0000 (Sat, 17 Apr 2010)

Log Message:
-----------
minor cleanup

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PyBuiltinCallable.java
    trunk/jython/src/org/python/core/PyXRange.java

Modified: trunk/jython/src/org/python/core/PyBuiltinCallable.java
===================================================================
--- trunk/jython/src/org/python/core/PyBuiltinCallable.java	2010-04-16 18:50:03 UTC (rev 7030)
+++ trunk/jython/src/org/python/core/PyBuiltinCallable.java	2010-04-17 16:51:11 UTC (rev 7031)
@@ -1,3 +1,4 @@
+/* Copyright (c) Jython Developers */
 package org.python.core;
 
 import org.python.expose.ExposedGet;
@@ -53,6 +54,7 @@
         this.info = info;
     }
 
+    @Override
     public String toString() {
         PyObject self = getSelf();
         if (self == null) {
@@ -76,6 +78,10 @@
 
     public static class DefaultInfo implements Info {
 
+        private String name;
+
+        private int maxargs, minargs;
+
         public DefaultInfo(String name, int minargs, int maxargs) {
             this.name = name;
             this.minargs = minargs;
@@ -86,10 +92,6 @@
             this(name, -1, -1);
         }
 
-        private String name;
-
-        private int maxargs, minargs;
-
         public String getName() {
             return name;
         }
@@ -103,39 +105,39 @@
         }
 
         public static boolean check(int nargs, int minargs, int maxargs) {
-            if(nargs < minargs)
+            if (nargs < minargs) {
                 return false;
-            if(maxargs != -1 && nargs > maxargs)
+            }
+            if (maxargs != -1 && nargs > maxargs) {
                 return false;
+            }
             return true;
         }
 
-        public static PyException unexpectedCall(int nargs,
-                                                 boolean keywords,
-                                                 String name,
-                                                 int minargs,
-                                                 int maxargs) {
-            if(keywords)
+        public static PyException unexpectedCall(int nargs, boolean keywords, String name,
+                                                 int minargs, int maxargs) {
+            if (keywords) {
                 return Py.TypeError(name + "() takes no keyword arguments");
+            }
+
             String argsblurb;
-            if(minargs == maxargs) {
-                if(minargs == 0)
+            if (minargs == maxargs) {
+                if (minargs == 0) {
                     argsblurb = "no arguments";
-                else if(minargs == 1)
+                } else if (minargs == 1) {
                     argsblurb = "exactly one argument";
-                else
+                } else {
                     argsblurb = minargs + " arguments";
-            } else if(maxargs == -1) {
-                return Py.TypeError(name + "() requires at least " + minargs
-                        + " (" + nargs + " given)");
+                }
+            } else if (maxargs == -1) {
+                return Py.TypeError(String.format("%s() requires at least %d arguments (%d) given",
+                                                  name, minargs, nargs));
+            } else if (minargs <= 0) {
+                argsblurb = "at most " + maxargs + " arguments";
             } else {
-                if(minargs <= 0)
-                    argsblurb = "at most " + maxargs + " arguments";
-                else
-                    argsblurb = minargs + "-" + maxargs + " arguments";
+                argsblurb = minargs + "-" + maxargs + " arguments";
             }
-            return Py.TypeError(name + "() takes " + argsblurb + " (" + nargs
-                    + " given)");
+            return Py.TypeError(String.format("%s() takes %s (%d given)", name, argsblurb, nargs));
         }
 
         public PyException unexpectedCall(int nargs, boolean keywords) {

Modified: trunk/jython/src/org/python/core/PyXRange.java
===================================================================
--- trunk/jython/src/org/python/core/PyXRange.java	2010-04-16 18:50:03 UTC (rev 7030)
+++ trunk/jython/src/org/python/core/PyXRange.java	2010-04-17 16:51:11 UTC (rev 7031)
@@ -14,11 +14,11 @@
 
     public static final PyType TYPE = PyType.fromClass(PyXRange.class);
 
-    private int start;
+    private final int start;
 
-    private int step;
+    private final int step;
 
-    private int len;
+    private final int len;
 
     public PyXRange(int ihigh) {
         this(0, ihigh, 1);
@@ -145,15 +145,13 @@
 
     @Override
     public String toString() {
-        String rtn;
         int stop = start + len * step;
         if (start == 0 && step == 1) {
-            rtn = String.format("xrange(%d)", stop);
+            return String.format("xrange(%d)", stop);
         } else if (step == 1) {
-            rtn = String.format("xrange(%d, %d)", start, stop);
+            return String.format("xrange(%d, %d)", start, stop);
         } else {
-            rtn = String.format("xrange(%d, %d, %d)", start, stop, step);
+            return String.format("xrange(%d, %d, %d)", start, stop, step);
         }
-        return rtn;
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.