浏览代码

pygrass: fix missing python3 types

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@68354 15284696-431f-4ddb-bdfa-cd5b030d7da7
Pietro Zambelli 9 年之前
父节点
当前提交
322523614c
共有 2 个文件被更改,包括 11 次插入2 次删除
  1. 5 0
      lib/python/pygrass/modules/interface/parameter.py
  2. 6 2
      lib/python/pygrass/vector/table.py

+ 5 - 0
lib/python/pygrass/modules/interface/parameter.py

@@ -8,6 +8,11 @@ from __future__ import (nested_scopes, generators, division, absolute_import,
                         with_statement, print_function, unicode_literals)
 import re
 
+try:
+    from builtins import unicode
+except ImportError:
+    unicode = str
+
 from grass.pygrass.modules.interface.docstring import docstring_property
 from grass.pygrass.modules.interface.read import GETTYPE, element2dict, DOC
 

+ 6 - 2
lib/python/pygrass/vector/table.py

@@ -9,9 +9,13 @@ from __future__ import (nested_scopes, generators, division, absolute_import,
                         with_statement, print_function, unicode_literals)
 
 import os
-import sys
 
-long = int if sys.version_info[0] == 3 else long
+try:
+    from builtins import long, unicode
+except ImportError:
+    # python3
+    long = int
+    unicode = str
 
 import ctypes
 import numpy as np