summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a>2011-08-22 00:30:07 +0000
committercliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a>2011-08-22 00:30:07 +0000
commitca11f067f58d9ce777adb358bb85d48ea84015e2 (patch)
tree6790a980c6a40d03b1db5e62bb091fe9759d3966
parent4370b3def9f01a8f5bd565056b45c47023105c99 (diff)
downloadpyserial-ca11f067f58d9ce777adb358bb85d48ea84015e2.tar.gz
use absolute imports so that 2to3 works
git-svn-id: http://svn.code.sf.net/p/pyserial/code/trunk/pyserial@423 f19166aa-fa4f-0410-85c2-fa1106f25c8a
-rw-r--r--serial/__init__.py8
-rw-r--r--serial/rfc2217.py2
-rw-r--r--serial/serialcli.py2
-rw-r--r--serial/serialjava.py2
-rw-r--r--serial/serialposix.py2
-rw-r--r--serial/serialwin32.py4
-rw-r--r--serial/sermsdos.py2
-rw-r--r--serial/tools/list_ports.py4
8 files changed, 13 insertions, 13 deletions
diff --git a/serial/__init__.py b/serial/__init__.py
index 986f7a4..9f56f66 100644
--- a/serial/__init__.py
+++ b/serial/__init__.py
@@ -11,16 +11,16 @@ VERSION = '2.6-pre1'
import sys
if sys.platform == 'cli':
- from serialcli import *
+ from serial.serialcli import *
else:
import os
# chose an implementation, depending on os
if os.name == 'nt': #sys.platform == 'win32':
- from serialwin32 import *
+ from serial.serialwin32 import *
elif os.name == 'posix':
- from serialposix import *
+ from serial.serialposix import *
elif os.name == 'java':
- from serialjava import *
+ from serial.serialjava import *
else:
raise ImportError("Sorry: no implementation for your platform ('%s') available" % (os.name,))
diff --git a/serial/rfc2217.py b/serial/rfc2217.py
index 3d05a85..776a210 100644
--- a/serial/rfc2217.py
+++ b/serial/rfc2217.py
@@ -59,7 +59,7 @@
# RFC).
# the order of the options is not relevant
-from serialutil import *
+from serial.serialutil import *
import time
import struct
import socket
diff --git a/serial/serialcli.py b/serial/serialcli.py
index 0a890c5..2c811f5 100644
--- a/serial/serialcli.py
+++ b/serial/serialcli.py
@@ -9,7 +9,7 @@
import clr
import System
import System.IO.Ports
-from serialutil import *
+from serial.serialutil import *
def device(portnum):
diff --git a/serial/serialjava.py b/serial/serialjava.py
index 1993ee9..46a78f8 100644
--- a/serial/serialjava.py
+++ b/serial/serialjava.py
@@ -7,7 +7,7 @@
# (C) 2002-2008 Chris Liechti <cliechti@gmx.net>
# this is distributed under a free software license, see license.txt
-from serialutil import *
+from serial.serialutil import *
def my_import(name):
mod = __import__(name)
diff --git a/serial/serialposix.py b/serial/serialposix.py
index 7ff5ff6..f225c78 100644
--- a/serial/serialposix.py
+++ b/serial/serialposix.py
@@ -13,7 +13,7 @@
# references: http://www.easysw.com/~mike/serial/serial.html
import sys, os, fcntl, termios, struct, select, errno, time
-from serialutil import *
+from serial.serialutil import *
# Do check the Python version as some constants have moved.
if (sys.hexversion < 0x020100f0):
diff --git a/serial/serialwin32.py b/serial/serialwin32.py
index 42aa0c4..4c7f23d 100644
--- a/serial/serialwin32.py
+++ b/serial/serialwin32.py
@@ -9,9 +9,9 @@
# Initial patch to use ctypes by Giovanni Bajo <rasky@develer.com>
import ctypes
-import win32
+from serial import win32
-from serialutil import *
+from serial.serialutil import *
def device(portnum):
diff --git a/serial/sermsdos.py b/serial/sermsdos.py
index c3560d0..09a0017 100644
--- a/serial/sermsdos.py
+++ b/serial/sermsdos.py
@@ -38,7 +38,7 @@
import os
import sys
import string
-import serialutil
+import serial.serialutil
BAUD_RATES = {
110: "11",
diff --git a/serial/tools/list_ports.py b/serial/tools/list_ports.py
index 30d94c9..c652fef 100644
--- a/serial/tools/list_ports.py
+++ b/serial/tools/list_ports.py
@@ -24,9 +24,9 @@ import sys, os, re
import os
# chose an implementation, depending on os
if os.name == 'nt': #sys.platform == 'win32':
- from list_ports_windows import *
+ from serial.tools.list_ports_windows import *
elif os.name == 'posix':
- from list_ports_posix import *
+ from serial.tools.list_ports_posix import *
#~ elif os.name == 'java':
else:
raise ImportError("Sorry: no implementation for your platform ('%s') available" % (os.name,))