summaryrefslogtreecommitdiff
path: root/numpy/ma/core.py
diff options
context:
space:
mode:
authorSeth Troisi <sethtroisi@google.com>2020-01-15 17:03:58 -0800
committerSeth Troisi <sethtroisi@google.com>2020-01-20 15:22:57 -0800
commit9a21ec857b22ff0140a7f71a12f2cc943f163404 (patch)
tree1f8b26a1bb346fab26d2210de286d29011bf2bf1 /numpy/ma/core.py
parentb753aa7a3a2c958e70826fb8af3b56db5c758819 (diff)
downloadnumpy-9a21ec857b22ff0140a7f71a12f2cc943f163404.tar.gz
[MAINT] Cleanup python2 sys.version checks
Diffstat (limited to 'numpy/ma/core.py')
-rw-r--r--numpy/ma/core.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index 30aef7465..4148e4597 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -20,6 +20,7 @@ Released for unlimited redistribution.
"""
# pylint: disable-msg=E1002
+import builtins
import sys
import operator
import warnings
@@ -27,11 +28,6 @@ import textwrap
import re
from functools import reduce
-if sys.version_info[0] >= 3:
- import builtins
-else:
- import __builtin__ as builtins
-
import numpy as np
import numpy.core.umath as umath
import numpy.core.numerictypes as ntypes
@@ -6394,10 +6390,6 @@ class MaskedConstant(MaskedArray):
def __str__(self):
return str(masked_print_option._display)
- if sys.version_info.major < 3:
- def __unicode__(self):
- return unicode(masked_print_option._display)
-
def __repr__(self):
if self is MaskedConstant.__singleton:
return 'masked'