[Jython-checkins] jython: divisionWarning -> division_warning to fix regrtest.

[frank.wierzbicki]

http://hg.python.org/jython/rev/9a6a9ea2f56b
changeset:   6382:9a6a9ea2f56b
parent:      6379:d668f865d290
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Wed Mar 14 16:08:03 2012 -0700
summary:
  divisionWarning -> division_warning to fix regrtest.

files:
  .hgsubstate                          |   2 +-
  src/org/python/core/Options.java     |  12 ++++++------
  src/org/python/core/PyComplex.java   |   4 ++--
  src/org/python/core/PyFloat.java     |   4 ++--
  src/org/python/core/PyInteger.java   |   4 ++--
  src/org/python/core/PyLong.java      |   4 ++--
  src/org/python/modules/_hashlib.java |   2 +-
  src/org/python/util/jython.java      |   6 +++---
  8 files changed, 19 insertions(+), 19 deletions(-)


diff --git a/.hgsubstate b/.hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,1 +1,1 @@
-88850 CPythonLib
+88741 CPythonLib
diff --git a/src/org/python/core/Options.java b/src/org/python/core/Options.java
--- a/src/org/python/core/Options.java
+++ b/src/org/python/core/Options.java
@@ -98,7 +98,7 @@
      * <li>warnall: 2</li>
      * </ul>
      */
-    public static int divisionWarning = 0;
+    public static int division_warning = 0;
 
     //
     // ####### END OF OPTIONS
@@ -169,16 +169,16 @@
 
         Options.Qnew = getBooleanOption("options.Qnew", Options.Qnew);
 
-        prop = PySystemState.registry.getProperty("python.divisionWarning");
+        prop = PySystemState.registry.getProperty("python.division_warning");
         if (prop != null) {
             if (prop.equalsIgnoreCase("old")) {
-                Options.divisionWarning = 0;
+                Options.division_warning = 0;
             } else if (prop.equalsIgnoreCase("warn")) {
-                Options.divisionWarning = 1;
+                Options.division_warning = 1;
             } else if (prop.equalsIgnoreCase("warnall")) {
-                Options.divisionWarning = 2;
+                Options.division_warning = 2;
             } else {
-                throw Py.ValueError("Illegal divisionWarning option "
+                throw Py.ValueError("Illegal division_warning option "
                         + "setting: '" + prop + "'");
             }
         }
diff --git a/src/org/python/core/PyComplex.java b/src/org/python/core/PyComplex.java
--- a/src/org/python/core/PyComplex.java
+++ b/src/org/python/core/PyComplex.java
@@ -434,7 +434,7 @@
         if (!canCoerce(right)) {
             return null;
         }
-        if (Options.divisionWarning >= 2) {
+        if (Options.division_warning >= 2) {
             Py.warning(Py.DeprecationWarning, "classic complex division");
         }
         return _div(this, coerce(right));
@@ -450,7 +450,7 @@
         if (!canCoerce(left)) {
             return null;
         }
-        if (Options.divisionWarning >= 2) {
+        if (Options.division_warning >= 2) {
             Py.warning(Py.DeprecationWarning, "classic complex division");
         }
         return _div(coerce(left), this);
diff --git a/src/org/python/core/PyFloat.java b/src/org/python/core/PyFloat.java
--- a/src/org/python/core/PyFloat.java
+++ b/src/org/python/core/PyFloat.java
@@ -381,7 +381,7 @@
         if (!canCoerce(right)) {
             return null;
         }
-        if (Options.divisionWarning >= 2) {
+        if (Options.division_warning >= 2) {
             Py.warning(Py.DeprecationWarning, "classic float division");
         }
 
@@ -402,7 +402,7 @@
         if (!canCoerce(left)) {
             return null;
         }
-        if (Options.divisionWarning >= 2) {
+        if (Options.division_warning >= 2) {
             Py.warning(Py.DeprecationWarning, "classic float division");
         }
 
diff --git a/src/org/python/core/PyInteger.java b/src/org/python/core/PyInteger.java
--- a/src/org/python/core/PyInteger.java
+++ b/src/org/python/core/PyInteger.java
@@ -361,7 +361,7 @@
         if (!canCoerce(right)) {
             return null;
         }
-        if (Options.divisionWarning > 0) {
+        if (Options.division_warning > 0) {
             Py.warning(Py.DeprecationWarning, "classic int division");
         }
         return Py.newInteger(divide(getValue(), coerce(right)));
@@ -377,7 +377,7 @@
         if (!canCoerce(left)) {
             return null;
         }
-        if (Options.divisionWarning > 0) {
+        if (Options.division_warning > 0) {
             Py.warning(Py.DeprecationWarning, "classic int division");
         }
         return Py.newInteger(divide(coerce(left), getValue()));
diff --git a/src/org/python/core/PyLong.java b/src/org/python/core/PyLong.java
--- a/src/org/python/core/PyLong.java
+++ b/src/org/python/core/PyLong.java
@@ -444,7 +444,7 @@
         if (!canCoerce(right)) {
             return null;
         }
-        if (Options.divisionWarning > 0) {
+        if (Options.division_warning > 0) {
             Py.warning(Py.DeprecationWarning, "classic long division");
         }
         return Py.newLong(divide( getValue(), coerce(right)));
@@ -460,7 +460,7 @@
         if (!canCoerce(left)) {
             return null;
         }
-        if (Options.divisionWarning > 0) {
+        if (Options.division_warning > 0) {
             Py.warning(Py.DeprecationWarning, "classic long division");
         }
         return Py.newLong(divide(coerce(left), getValue()));
diff --git a/src/org/python/modules/_hashlib.java b/src/org/python/modules/_hashlib.java
--- a/src/org/python/modules/_hashlib.java
+++ b/src/org/python/modules/_hashlib.java
@@ -129,7 +129,7 @@
         private static final Map<String, Integer> blockSizes = new HashMap<String, Integer>() {{
                 put("md5", 64);
                 put("sha-1", 64);
-                put("sha-224", 64);
+                //put("sha-224", 64);
                 put("sha-256", 64);
                 put("sha-384", 128);
                 put("sha-512", 128);
diff --git a/src/org/python/util/jython.java b/src/org/python/util/jython.java
--- a/src/org/python/util/jython.java
+++ b/src/org/python/util/jython.java
@@ -195,11 +195,11 @@
 
         if (opts.division != null) {
             if ("old".equals(opts.division)) {
-                Options.divisionWarning = 0;
+                Options.division_warning = 0;
             } else if ("warn".equals(opts.division)) {
-                Options.divisionWarning = 1;
+                Options.division_warning = 1;
             } else if ("warnall".equals(opts.division)) {
-                Options.divisionWarning = 2;
+                Options.division_warning = 2;
             } else if ("new".equals(opts.division)) {
                 Options.Qnew = true;
                 interp.cflags.setFlag(CodeFlag.CO_FUTURE_DIVISION);

-- 
Repository URL: http://hg.python.org/jython