dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

Fix some deprecated things and a bug or two

Browse Source
This commit is contained in:
Ryan Holmes
2017-07-02 23:08:02 -04:00
parent de5a734919
commit 7ae41b71b2
6 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/utils/floatspin.py
View File

@@ -197,6 +197,10 @@ EVT_FLOATSPIN = wx.PyEventBinder(wxEVT_FLOATSPIN, 1)
""" with the keyboard. """
def _cmp(self, a, b):
return (a>b)-(a<b)
# ---------------------------------------------------------------------------- #
# Class FloatSpinEvent
# ---------------------------------------------------------------------------- #
@@ -1417,7 +1421,7 @@ class FixedPoint(object):
if (other == None):
return 1
xn, yn, p = _norm(self, other)
return cmp(xn, yn)
return _cmp(xn, yn)
def __hash__(self):
# caution! == values must have equal hashes, and a FixedPoint
@@ -1596,7 +1600,7 @@ def _mkFP(n, p, FixedPoint=FixedPoint):
def _roundquotient(x, y):
assert y > 0
n, leftover = divmod(x, y)
c = cmp(leftover << 1, y)
c = _cmp(leftover << 1, y)
# c < 0 <-> leftover < y/2, etc
if c > 0 or (c == 0 and (n & 1) == 1):
n = n + 1