Browse Source

Renamed _socket to _device for consistencys sake

pyserial_fix
Scott Petersen 12 years ago
parent
commit
ce09d6d4e6
1 changed files with 8 additions and 8 deletions
  1. +8
    -8
      pyad2usb/devices.py

+ 8
- 8
pyad2usb/devices.py View File

@@ -386,7 +386,7 @@ class SocketDevice(Device):
""" """
self._host = "localhost" self._host = "localhost"
self._port = 10000 self._port = 10000
self._socket = None
self._device = None
self._buffer = '' self._buffer = ''
self._running = False self._running = False


@@ -406,8 +406,8 @@ class SocketDevice(Device):
self._host, self._port = interface self._host, self._port = interface


try: try:
self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self._socket.connect((self._host, self._port))
self._device = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self._device.connect((self._host, self._port))
except socket.error, err: except socket.error, err:
self.on_close() self.on_close()


@@ -426,8 +426,8 @@ class SocketDevice(Device):


try: try:
self._read_thread.stop() self._read_thread.stop()
self._socket.shutdown(socket.SHUT_RDWR)
self._socket.close()
self._device.shutdown(socket.SHUT_RDWR) # Make sure that it closes immediately.
self._device.close()
except: except:
pass pass


@@ -443,7 +443,7 @@ class SocketDevice(Device):
""" """
Writes data to the device. Writes data to the device.
""" """
data_sent = self._socket.send(data)
data_sent = self._device.send(data)


if data_sent == 0: if data_sent == 0:
raise util.CommError('Error while sending data.') raise util.CommError('Error while sending data.')
@@ -456,7 +456,7 @@ class SocketDevice(Device):
""" """
Reads a single character from the device. Reads a single character from the device.
""" """
return self._socket.recv(1)
return self._device.recv(1)


def read_line(self, timeout=0.0): def read_line(self, timeout=0.0):
""" """
@@ -468,7 +468,7 @@ class SocketDevice(Device):


try: try:
while self._running: while self._running:
buf = self._socket.recv(1)
buf = self._device.recv(1)


if buf != '': if buf != '':
self._buffer += buf self._buffer += buf


Loading…
Cancel
Save