[Liblas-commits] r1257 - trunk/python/liblas

[liblas-commits at liblas.org]

Author: hobu
Date: Thu May  7 12:24:18 2009
New Revision: 1257
URL: http://liblas.org/changeset/1257

Log:
fix up our imports so we work in py3k

Modified:
   trunk/python/liblas/__init__.py
   trunk/python/liblas/color.py
   trunk/python/liblas/file.py
   trunk/python/liblas/guid.py
   trunk/python/liblas/header.py
   trunk/python/liblas/point.py
   trunk/python/liblas/srs.py
   trunk/python/liblas/vlr.py

Modified: trunk/python/liblas/__init__.py
==============================================================================
--- trunk/python/liblas/__init__.py	(original)
+++ trunk/python/liblas/__init__.py	Thu May  7 12:24:18 2009
@@ -1,11 +1,13 @@
-from core import *
+#from .core import *
+from core import get_version
+from core import las
 version = get_version()
 HAVE_GDAL = bool(las.LAS_IsGDALEnabled())
 HAVE_LIBGEOTIFF = bool(las.LAS_IsLibGeoTIFFEnabled())
 
-import file
-import point
-import header
-import vlr
-import color
-import srs
+from . import file
+from . import point
+from . import header
+from . import vlr
+from . import color
+from . import srs

Modified: trunk/python/liblas/color.py
==============================================================================
--- trunk/python/liblas/color.py	(original)
+++ trunk/python/liblas/color.py	Thu May  7 12:24:18 2009
@@ -40,7 +40,7 @@
  * OF SUCH DAMAGE.
  ****************************************************************************/
  """
-import core
+from . import core
 import ctypes
 
 class Color(object):

Modified: trunk/python/liblas/file.py
==============================================================================
--- trunk/python/liblas/file.py	(original)
+++ trunk/python/liblas/file.py	Thu May  7 12:24:18 2009
@@ -40,9 +40,9 @@
  * OF SUCH DAMAGE.
  ****************************************************************************/
  """
-import core
-import header as lasheader
-import point
+from . import core
+from . import header as lasheader
+from . import point
 
 import os
 import types

Modified: trunk/python/liblas/guid.py
==============================================================================
--- trunk/python/liblas/guid.py	(original)
+++ trunk/python/liblas/guid.py	Thu May  7 12:24:18 2009
@@ -40,7 +40,7 @@
  * OF SUCH DAMAGE.
  ****************************************************************************/
  """
-import core
+from . import core
 
 class GUID(object):
     def __init__(self, key=None, handle=None):

Modified: trunk/python/liblas/header.py
==============================================================================
--- trunk/python/liblas/header.py	(original)
+++ trunk/python/liblas/header.py	Thu May  7 12:24:18 2009
@@ -40,11 +40,11 @@
  * OF SUCH DAMAGE.
  ****************************************************************************/
  """
-import core
+from . import core
 import datetime
-import guid
-import vlr
-import srs
+from . import guid
+from . import vlr
+from . import srs
 
 def leap_year(year):
     if (year % 400) == 0:

Modified: trunk/python/liblas/point.py
==============================================================================
--- trunk/python/liblas/point.py	(original)
+++ trunk/python/liblas/point.py	Thu May  7 12:24:18 2009
@@ -40,11 +40,11 @@
  * OF SUCH DAMAGE.
  ****************************************************************************/
  """
-import core
+from . import core
 import datetime
 import time
 import math
-import color
+from . import color
 
 class Point(object):
     def __init__(self, owned=True, handle=None, copy=False):

Modified: trunk/python/liblas/srs.py
==============================================================================
--- trunk/python/liblas/srs.py	(original)
+++ trunk/python/liblas/srs.py	Thu May  7 12:24:18 2009
@@ -40,9 +40,9 @@
  * OF SUCH DAMAGE.
  ****************************************************************************/
  """
-import core
+from . import core
 import ctypes
-import vlr
+from . import vlr
 
 class SRS(object):
     def __init__(self, owned=True, handle=None):

Modified: trunk/python/liblas/vlr.py
==============================================================================
--- trunk/python/liblas/vlr.py	(original)
+++ trunk/python/liblas/vlr.py	Thu May  7 12:24:18 2009
@@ -40,7 +40,7 @@
  * OF SUCH DAMAGE.
  ****************************************************************************/
  """
-import core
+from . import core
 import ctypes
 
 class VLR(object):