Changeset 71442

Timestamp:

Aug 27, 2017, 9:50:26 PM (7 years ago)

Author:

zarch

Message:

python.builtins: removed builtins import in python2 (trunk: r71435, r71438)

Location:

grass/branches/releasebranch_7_2/lib/python

Files:

• ctypes/ctypesgencore/parser/cgrammar.py (modified) (2 diffs)
• ctypes/ctypesgencore/parser/pplexer.py (modified) (2 diffs)
• ctypes/ctypesgencore/printer/preamble.py (modified) (2 diffs)
• pygrass/vector/table.py (modified) (1 diff)
• pygrass/vector/testsuite/test_table.py (modified) (2 diffs)
• script/raster.py (modified) (2 diffs)
• script/task.py (modified) (1 diff)
• script/utils.py (modified) (1 diff)
• temporal/core.py (modified) (1 diff)

grass/branches/releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/cgrammar.py

@@ -11 +11 @@
 
 '''
-try:
-    from builtins import long
-except ImportError:
-    # python3
-    long = int
-
 __docformat__ = 'restructuredtext'
 
@@ -30 +24 @@
 from . import preprocessor
 from . import yacc
+
+
+if sys.version_info.major == 3:
+    long = int
 
 

grass/branches/releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/pplexer.py

@@ -10 +10 @@
 
 __docformat__ = 'restructuredtext'
-
-try:
-    from builtins import long
-    PY2 = True
-except ImportError:
-    # python3
-    PY2 = False
-    long = int
 
 import os
@@ -30 +22 @@
 from . import yacc
 from .lex import TOKEN
+
+
+PY2 = True
+if sys.version_info.major == 3:
+    PY2 = False
+    long = int
+
 
 tokens = (

grass/branches/releasebranch_7_2/lib/python/ctypes/ctypesgencore/printer/preamble.py

@@ -1 @@
-try:
-    from builtins import long
-except ImportError:
-    long = int
-
 import os
 import sys
@@ -9 +4 @@
 import ctypes
 from ctypes import *
+
+if sys.version_info.major == 3:
+    long = int
+
 
 _int_types = (c_int16, c_int32)

grass/branches/releasebranch_7_2/lib/python/pygrass/vector/table.py

@@ -10 +10 @@
 
 import os
-
-try:
-    from builtins import long, unicode
-except ImportError:
-    # python3
+import sys
+
+if sys.version_info.major == 3:
     long = int
     unicode = str

grass/branches/releasebranch_7_2/lib/python/pygrass/vector/testsuite/test_table.py

@@ -5 +5 @@
 @author: pietro
 """
-try:
-    from builtins import long
-except ImportError:
-    # python3
-    long = int
-
 import os
 import sqlite3
+import sys
 import tempfile as tmp
 from string import ascii_letters, digits
@@ -23 +18 @@
 from grass.pygrass.vector.table import Table, get_path
 
+
+if sys.version_info.major == 3:
+    long = int
 
 # dictionary that generate random data

grass/branches/releasebranch_7_2/lib/python/script/raster.py

@@ -21 +21 @@
 
 import os
+import sys
 import string
 import time
@@ -29 +30 @@
 
 
-try:
-    from builtins import unicode
-    bytes = str
-except ImportError:
-    # python3
+if sys.version_info.major == 3:
     unicode = str
 

grass/branches/releasebranch_7_2/lib/python/script/task.py

@@ -19 +19 @@
 """
 import re
-import types
+import sys
 import string
 
-try:
-    from builtins import unicode
-    bytes = str
-except ImportError:
-    # python3
+if sys.version_info.major == 3:
     unicode = str
 

grass/branches/releasebranch_7_2/lib/python/script/utils.py

@@ -24 +24 @@
 import shlex
 import re
+
+if sys.version_info.major == 3:
+    unicode = str
+
 
 def float_or_dms(s):

grass/branches/releasebranch_7_2/lib/python/temporal/core.py

@@ -31 +31 @@
 #import traceback
 import os
+import sys
+
+import grass.script as gscript
 # i18N
 import gettext
 gettext.install('grasslibs', os.path.join(os.getenv("GISBASE"), 'locale'))
 
-try:
-    from builtins import long
-except ImportError:
-    # python3
+if sys.version_info.major == 3:
     long = int
 
-import grass.script as gscript
 from datetime import datetime
 from .c_libraries_interface import *