python.builtins: remove wrong imports

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@71438 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/python/ctypes/ctypesgencore/parser/cgrammar.py

@@ -10,12 +10,6 @@ Reference is C99:
   * http://www.open-std.org/JTC1/SC22/WG14/www/docs/n1124.pdf
 
 '''
-try:
-    from builtins import long
-except ImportError:
-    # python3
-    long = int
-
 __docformat__ = 'restructuredtext'
 
 import operator
@@ -31,6 +25,10 @@ from . import preprocessor
 from . import yacc
 
 
+if sys.version_info.major == 3:
+    long = int
+
+
 tokens = (
     'PP_DEFINE', 'PP_DEFINE_NAME', 'PP_DEFINE_MACRO_NAME', 'PP_MACRO_PARAM',
     'PP_STRINGIFY', 'PP_IDENTIFIER_PASTE', 'PP_END_DEFINE',

lib/python/ctypes/ctypesgencore/parser/pplexer.py

@@ -10,14 +10,6 @@ Reference is C99:
 
 __docformat__ = 'restructuredtext'
 
-try:
-    from builtins import long
-    PY2 = True
-except ImportError:
-    # python3
-    PY2 = False
-    long = int
-
 import os
 import re
 import shlex
@@ -30,6 +22,13 @@ from . import lex
 from . import yacc
 from .lex import TOKEN
 
+
+PY2 = True
+if sys.version_info.major == 3:
+    PY2 = False
+    long = int
+
+
 tokens = (
     'HEADER_NAME', 'IDENTIFIER', 'PP_NUMBER', 'CHARACTER_CONSTANT',
     'STRING_LITERAL', 'OTHER',

lib/python/ctypes/ctypesgencore/printer/preamble.py

@@ -1,14 +1,13 @@
-try:
-    from builtins import long
-except ImportError:
-    long = int
-
 import os
 import sys
 
 import ctypes
 from ctypes import *
 
+if sys.version_info.major == 3:
+    long = int
+
+
 _int_types = (c_int16, c_int32)
 if hasattr(ctypes, 'c_int64'):
     # Some builds of ctypes apparently do not have c_int64

lib/python/pygrass/vector/table.py

@@ -9,11 +9,9 @@ from __future__ import (nested_scopes, generators, division, absolute_import,
                         with_statement, print_function, unicode_literals)
 
 import os
+import sys
 
-try:
-    from builtins import long, unicode
-except ImportError:
-    # python3
+if sys.version_info.major == 3:
     long = int
     unicode = str
 

lib/python/pygrass/vector/testsuite/test_table.py

@@ -4,14 +4,9 @@ Created on Wed Jun 25 11:08:22 2014
 
 @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
 from random import choice
@@ -23,6 +18,9 @@ from grass.gunittest.main import test
 from grass.pygrass.vector.table import Table, get_path
 
 
+if sys.version_info.major == 3:
+    long = int
+
 # dictionary that generate random data
 COL2VALS = {'INT': lambda n:     np.random.randint(9, size=n),
             'INTEGER': lambda n: np.random.randint(9, size=n),

lib/python/script/raster.py

@@ -20,6 +20,7 @@ for details.
 from __future__ import absolute_import
 
 import os
+import sys
 import string
 import time
 
@@ -28,11 +29,7 @@ from grass.exceptions import CalledModuleError
 from .utils import float_or_dms, parse_key_val
 
 
-try:
-    from builtins import unicode
-    bytes = str
-except ImportError:
-    # python3
+if sys.version_info.major == 3:
     unicode = str
 
 

lib/python/script/task.py

@@ -18,14 +18,10 @@ for details.
 .. sectionauthor:: Martin Landa <landa.martin gmail.com>
 """
 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
 
 try:

lib/python/temporal/core.py

@@ -30,15 +30,13 @@ for details.
 """
 #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
 
 from .c_libraries_interface import *