diff options
author | Timothy Edmund Crosley <timothy.crosley@gmail.com> | 2016-03-26 22:17:39 -0700 |
---|---|---|
committer | Timothy Edmund Crosley <timothy.crosley@gmail.com> | 2016-03-26 22:17:39 -0700 |
commit | 83405a8e45904e9b16b2681c15419735e654a0a6 (patch) | |
tree | 43fe239253a88c8b9c667a762105688ef37b91e9 | |
parent | 54ed23ec8792219c9e6b34579f4b5733a87ce7ab (diff) | |
parent | c97249e03abd4dbaad7d49d9455036a2858e94ef (diff) | |
download | pies-83405a8e45904e9b16b2681c15419735e654a0a6.tar.gz |
Fixed some Python 2.6 and IPython issues.
-rw-r--r-- | pies/overrides.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pies/overrides.py b/pies/overrides.py index ca3fe39..6b5fdac 100644 --- a/pies/overrides.py +++ b/pies/overrides.py @@ -21,6 +21,7 @@ OTHER DEALINGS IN THE SOFTWARE. """ from __future__ import absolute_import +import math as _math import abc import functools import sys @@ -97,13 +98,14 @@ else: range = xrange integer_types = (int, long) - import sys - stdout = sys.stdout - stderr = sys.stderr - reload(sys) - sys.stdout = stdout - sys.stderr = stderr - sys.setdefaultencoding('utf-8') + # Reloading the sys module kills IPython's output printing. + #import sys + #stdout = sys.stdout + #stderr = sys.stderr + #reload(sys) + #sys.stdout = stdout + #sys.stderr = stderr + #sys.setdefaultencoding('utf-8') def _create_not_allowed(name): def _not_allow(*args, **kwargs): @@ -197,6 +199,9 @@ else: if ndigits < 0: raise NotImplementedError('negative ndigits not supported yet') + # Python 2.6 doesn't support from_float. + if sys.version_info[1] <= 6: + return native_round(number, ndigits) exponent = Decimal('10') ** (-ndigits) d = Decimal.from_float(number).quantize(exponent, rounding=ROUND_HALF_EVEN) |