Skip to content

Commit 0b1eae9

Browse files
fwierzbickifwierzbicki
committed
divisionWarning -> division_warning to fix regrtest.
1 parent 22306c5 commit 0b1eae9

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

‎.hgsubstate‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
88850 CPythonLib
1+
88741 CPythonLib

‎src/org/python/core/Options.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public class Options {
9898
* <li>warnall: 2</li>
9999
* </ul>
100100
*/
101-
public static int divisionWarning = 0;
101+
public static int division_warning = 0;
102102

103103
//
104104
// ####### END OF OPTIONS
@@ -169,16 +169,16 @@ public static void setFromRegistry() {
169169

170170
Options.Qnew = getBooleanOption("options.Qnew", Options.Qnew);
171171

172-
prop = PySystemState.registry.getProperty("python.divisionWarning");
172+
prop = PySystemState.registry.getProperty("python.division_warning");
173173
if (prop != null) {
174174
if (prop.equalsIgnoreCase("old")) {
175-
Options.divisionWarning = 0;
175+
Options.division_warning = 0;
176176
} else if (prop.equalsIgnoreCase("warn")) {
177-
Options.divisionWarning = 1;
177+
Options.division_warning = 1;
178178
} else if (prop.equalsIgnoreCase("warnall")) {
179-
Options.divisionWarning = 2;
179+
Options.division_warning = 2;
180180
} else {
181-
throw Py.ValueError("Illegal divisionWarning option "
181+
throw Py.ValueError("Illegal division_warning option "
182182
+ "setting: '" + prop + "'");
183183
}
184184
}

‎src/org/python/core/PyComplex.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ final PyObject complex___div__(PyObject right) {
434434
if (!canCoerce(right)) {
435435
return null;
436436
}
437-
if (Options.divisionWarning >= 2) {
437+
if (Options.division_warning >= 2) {
438438
Py.warning(Py.DeprecationWarning, "classic complex division");
439439
}
440440
return _div(this, coerce(right));
@@ -450,7 +450,7 @@ final PyObject complex___rdiv__(PyObject left) {
450450
if (!canCoerce(left)) {
451451
return null;
452452
}
453-
if (Options.divisionWarning >= 2) {
453+
if (Options.division_warning >= 2) {
454454
Py.warning(Py.DeprecationWarning, "classic complex division");
455455
}
456456
return _div(coerce(left), this);

‎src/org/python/core/PyFloat.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ final PyObject float___div__(PyObject right) {
381381
if (!canCoerce(right)) {
382382
return null;
383383
}
384-
if (Options.divisionWarning >= 2) {
384+
if (Options.division_warning >= 2) {
385385
Py.warning(Py.DeprecationWarning, "classic float division");
386386
}
387387

@@ -402,7 +402,7 @@ final PyObject float___rdiv__(PyObject left) {
402402
if (!canCoerce(left)) {
403403
return null;
404404
}
405-
if (Options.divisionWarning >= 2) {
405+
if (Options.division_warning >= 2) {
406406
Py.warning(Py.DeprecationWarning, "classic float division");
407407
}
408408

‎src/org/python/core/PyInteger.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ final PyObject int___div__(PyObject right) {
361361
if (!canCoerce(right)) {
362362
return null;
363363
}
364-
if (Options.divisionWarning > 0) {
364+
if (Options.division_warning > 0) {
365365
Py.warning(Py.DeprecationWarning, "classic int division");
366366
}
367367
return Py.newInteger(divide(getValue(), coerce(right)));
@@ -377,7 +377,7 @@ final PyObject int___rdiv__(PyObject left) {
377377
if (!canCoerce(left)) {
378378
return null;
379379
}
380-
if (Options.divisionWarning > 0) {
380+
if (Options.division_warning > 0) {
381381
Py.warning(Py.DeprecationWarning, "classic int division");
382382
}
383383
return Py.newInteger(divide(coerce(left), getValue()));

‎src/org/python/core/PyLong.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ final PyObject long___div__(PyObject right) {
444444
if (!canCoerce(right)) {
445445
return null;
446446
}
447-
if (Options.divisionWarning > 0) {
447+
if (Options.division_warning > 0) {
448448
Py.warning(Py.DeprecationWarning, "classic long division");
449449
}
450450
return Py.newLong(divide( getValue(), coerce(right)));
@@ -460,7 +460,7 @@ final PyObject long___rdiv__(PyObject left) {
460460
if (!canCoerce(left)) {
461461
return null;
462462
}
463-
if (Options.divisionWarning > 0) {
463+
if (Options.division_warning > 0) {
464464
Py.warning(Py.DeprecationWarning, "classic long division");
465465
}
466466
return Py.newLong(divide(coerce(left), getValue()));

‎src/org/python/modules/_hashlib.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public static class Hash extends PyObject {
129129
private static final Map<String, Integer> blockSizes = new HashMap<String, Integer>() {{
130130
put("md5", 64);
131131
put("sha-1", 64);
132-
put("sha-224", 64);
132+
//put("sha-224", 64);
133133
put("sha-256", 64);
134134
put("sha-384", 128);
135135
put("sha-512", 128);

‎src/org/python/util/jython.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,11 @@ public static void run(String[] args) {
195195

196196
if (opts.division != null) {
197197
if ("old".equals(opts.division)) {
198-
Options.divisionWarning = 0;
198+
Options.division_warning = 0;
199199
} else if ("warn".equals(opts.division)) {
200-
Options.divisionWarning = 1;
200+
Options.division_warning = 1;
201201
} else if ("warnall".equals(opts.division)) {
202-
Options.divisionWarning = 2;
202+
Options.division_warning = 2;
203203
} else if ("new".equals(opts.division)) {
204204
Options.Qnew = true;
205205
interp.cflags.setFlag(CodeFlag.CO_FUTURE_DIVISION);

0 commit comments

Comments
 (0)