reverse renaming of modules

ebroecker · hardbyte · commit 458cb290c957 · 2017-10-16T13:59:45.000+11:00
use from __future__ import to avoid namespace collisions
diff --git a/can/CAN.py b/can/CAN.py
@@ -9,7 +9,7 @@
 from can.message import Message
 from can.listener import Listener, BufferedReader, RedirectReader
 from can.util import set_logging_level
-from can.formated_io import *
+from can.io import *
 
 import logging
 
diff --git a/can/__init__.py b/can/__init__.py
@@ -17,11 +17,11 @@ class CanError(IOError):
 
 from can.listener import Listener, BufferedReader, RedirectReader
 
-from can.formated_io import Logger, Printer, LogReader
-from can.formated_io import ASCWriter
-from can.formated_io import BLFReader, BLFWriter
-from can.formated_io import CSVWriter
-from can.formated_io import SqliteWriter, SqlReader
+from can.io import Logger, Printer, LogReader
+from can.io import ASCWriter
+from can.io import BLFReader, BLFWriter
+from can.io import CSVWriter
+from can.io import SqliteWriter, SqlReader
 
 from can.util import set_logging_level
 
diff --git a/can/interface.py b/can/interface.py
@@ -11,7 +11,7 @@
     'kvaser':           ('can.interfaces.kvaser', 'KvaserBus'),
     'socketcan_ctypes': ('can.interfaces.socketcan', 'SocketcanCtypes_Bus'),
     'socketcan_native': ('can.interfaces.socketcan', 'SocketcanNative_Bus'),
-    'basic_serial':     ('can.interfaces.basic_serial.serial_can', 'SerialBus'),
+    'serial':           ('can.interfaces.serial.serial_can', 'SerialBus'),
     'pcan':             ('can.interfaces.pcan', 'PcanBus'),
     'usb2can':          ('can.interfaces.usb2can', 'Usb2canBus'),
     'ixxat':            ('can.interfaces.ixxat', 'IXXATBus'),
diff --git a/can/interfaces/__init__.py b/can/interfaces/__init__.py
@@ -3,6 +3,6 @@
 Interfaces contain low level implementations that interact with CAN hardware.
 """
 
-VALID_INTERFACES = set(['kvaser', 'basic_serial', 'pcan', 'socketcan_native',
+VALID_INTERFACES = set(['kvaser', 'serial', 'pcan', 'socketcan_native',
                         'socketcan_ctypes', 'socketcan', 'usb2can', 'ixxat',
                         'nican', 'iscan', 'vector', 'remote', 'virtual', 'neovi','slcan'])
diff --git a/can/interfaces/basic_serial/__init__.py b/can/interfaces/basic_serial/__init__.py
diff --git a/can/interfaces/serial/__init__.py b/can/interfaces/serial/__init__.py
@@ -0,0 +1 @@
+from can.interfaces.serial.serial_can import SerialBus as Bus
diff --git a/can/interfaces/serial/serial_can.py b/can/interfaces/serial/serial_can.py
@@ -7,12 +7,12 @@
 
 import logging
 
-logger = logging.getLogger('can.basic_serial')
+logger = logging.getLogger('can.serial')
 
 try:
     import serial
 except ImportError:
-    logger.error("You won't be able to use the basic_serial can backend without the basic_serial module installed!")
+    logger.error("You won't be able to use the serial can backend without the serial module installed!")
     serial = None
 
 from can.bus import BusABC
@@ -22,22 +22,22 @@
 class SerialBus(BusABC):
 
     def __init__(self, channel, *args, **kwargs):
-        """A basic_serial interface to CAN.
+        """A serial interface to CAN.
 
         :param str channel:
-            The basic_serial device to open.
+            The serial device to open.
         """
         if channel == '':
-            raise TypeError("Must specify a basic_serial port.")
+            raise TypeError("Must specify a serial port.")
         else:
             self.channel_info = "Serial interface: " + channel
 
-            # Note: Some basic_serial port implementations don't care about the baud rate
+            # Note: Some serial port implementations don't care about the baud rate
             self.ser = serial.Serial(channel, baudrate=115200, timeout=0.1)
         super(SerialBus, self).__init__(*args, **kwargs)
 
     def send(self, msg, timeout=None):
-        raise NotImplementedError("This basic_serial interface doesn't support transmit.")
+        raise NotImplementedError("This serial interface doesn't support transmit.")
 
     def recv(self, timeout=None):
 
diff --git a/can/interfaces/slcan.py b/can/interfaces/slcan.py
@@ -2,6 +2,7 @@
 Interface for slcan compatible interfaces (win32/linux).
 (Linux could use slcand/socketcan also).
 """
+from __future__ import absolute_import
 
 import serial
 import io
@@ -32,9 +33,9 @@ def close(self):
     def __init__(self, channel, ttyBaudrate=115200, timeout=1, bitrate=None, poll_interval=0.01 , **kwargs):
         """
         :param string channel:
-            port of underlying basic_serial or usb device (e.g. /dev/ttyUSB0, COM8, ...)
+            port of underlying serial or usb device (e.g. /dev/ttyUSB0, COM8, ...)
         :param int ttyBaudrate:
-            baudrate of underlying basic_serial or usb device
+            baudrate of underlying serial or usb device
         :param int bitrate:
             Bitrate in bits/s
         :param float poll_interval:
diff --git a/can/interfaces/usb2can/serial_selector.py b/can/interfaces/usb2can/serial_selector.py
@@ -29,7 +29,7 @@ def serial():
 
     for objItem in colItems:
         string = objItem.Dependent
-        # find based on beginning of basic_serial
+        # find based on beginning of serial
         if "ED" in string:
             # print "Dependent:" + ` objItem.Dependent`
             string = string[len(string) - 9:len(string) - 1]
diff --git a/can/interfaces/usb2can/usb2canInterface.py b/can/interfaces/usb2can/usb2canInterface.py
@@ -76,8 +76,8 @@ class Usb2canBus(BusABC):
     Note the USB2CAN interface doesn't implement set_filters, or flush_tx_buffer methods.
 
     :param str channel:
-        The device's basic_serial number. If not provided, Windows Management Instrumentation
-        will be used to identify the first such device. The *kwarg* `basic_serial` may also be
+        The device's serial number. If not provided, Windows Management Instrumentation
+        will be used to identify the first such device. The *kwarg* `serial` may also be
         used.
 
     :param int bitrate:
@@ -99,9 +99,9 @@ def __init__(self, channel, *args, **kwargs):
         else:
             enable_flags = 0x00000008
 
-        # code to get the basic_serial number of the device
-        if 'basic_serial' in kwargs:
-            deviceID = kwargs["basic_serial"]
+        # code to get the serial number of the device
+        if 'serial' in kwargs:
+            deviceID = kwargs["serial"]
         elif channel is not None:
             deviceID = channel
         else:
diff --git a/can/io/__init__.py b/can/io/__init__.py
diff --git a/can/io/asc.py b/can/io/asc.py
diff --git a/can/io/blf.py b/can/io/blf.py
diff --git a/can/io/csv.py b/can/io/csv.py
diff --git a/can/io/logger.py b/can/io/logger.py
diff --git a/can/io/player.py b/can/io/player.py
@@ -5,7 +5,7 @@
 from .blf import BLFReader
 from .sqlite import SqlReader
 
-log = logging.getLogger('can.formated_io.player')
+log = logging.getLogger('can.io.player')
 
 
 class LogReader(object):
diff --git a/can/io/sqlite.py b/can/io/sqlite.py
@@ -7,7 +7,7 @@
 import sqlite3
 import logging
 
-log = logging.getLogger('can.formated_io.sql')
+log = logging.getLogger('can.io.sql')
 
 if sys.version_info > (3,):
     buffer = memoryview
diff --git a/can/io/stdout.py b/can/io/stdout.py
@@ -1,7 +1,7 @@
 from can.listener import Listener
 import logging
 
-log = logging.getLogger('can.formated_io.stdout')
+log = logging.getLogger('can.io.stdout')
 
 
 class Printer(Listener):
diff --git a/can/logger.py b/can/logger.py
@@ -20,7 +20,7 @@
 import socket
 
 import can
-from can.formated_io.logger import Logger
+from can.io.logger import Logger
 
 
 def main():
@@ -35,7 +35,7 @@ def main():
                         You can add several of these e.g., -vv is DEBUG''', default=2)
 
     parser.add_argument('-c', '--channel', help='''Most backend interfaces require some sort of channel.
-    For example with the basic_serial interface the channel might be a rfcomm device: "/dev/rfcomm0"
+    For example with the serial interface the channel might be a rfcomm device: "/dev/rfcomm0"
     With the socketcan interfaces valid channel examples include: "can0", "vcan0"''')
 
     parser.add_argument('-i', '--interface', dest="interface",
diff --git a/can/player.py b/can/player.py
@@ -10,7 +10,7 @@
 import datetime
 
 import can
-from can.formated_io.player import LogReader, MessageSync
+from can.io.player import LogReader, MessageSync
 
 
 def main():
@@ -26,7 +26,7 @@ def main():
 
     parser.add_argument('-c', '--channel',
                         help='''Most backend interfaces require some sort of channel.
-    For example with the basic_serial interface the channel might be a rfcomm device: "/dev/rfcomm0"
+    For example with the serial interface the channel might be a rfcomm device: "/dev/rfcomm0"
     With the socketcan interfaces valid channel examples include: "can0", "vcan0"''')
 
     parser.add_argument('-i', '--interface', dest="interface",
diff --git a/can/server.py b/can/server.py
@@ -15,7 +15,7 @@ def main():
                         You can add several of these e.g., -vv is DEBUG''', default=3)
 
     parser.add_argument('-c', '--channel', help='''Most backend interfaces require some sort of channel.
-    For example with the basic_serial interface the channel might be a rfcomm device: "/dev/rfcomm0"
+    For example with the serial interface the channel might be a rfcomm device: "/dev/rfcomm0"
     With the socketcan interfaces valid channel examples include: "can0", "vcan0".
     The server will only serve this channel. Start additional servers at different
     ports to share more channels.''')

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+from can.interfaces.serial.serial_can import SerialBus as Bus`