Browse Source

Merge branch 'ryandrake08-strip_leading_null' into dev

pyserial_fix
Scott Petersen 11 years ago
parent
commit
0ba2e647ab
6 changed files with 5 additions and 3 deletions
  1. +2
    -0
      alarmdecoder/decoder.py
  2. BIN
      docs/build/doctrees/environment.pickle
  3. BIN
      docs/build/html/objects.inv
  4. +1
    -1
      docs/build/html/searchindex.js
  5. +1
    -1
      setup.py
  6. +1
    -1
      test/test_ad2.py

+ 2
- 0
alarmdecoder/decoder.py View File

@@ -294,6 +294,8 @@ class AlarmDecoder(object):

:returns: :py:class:`~alarmdecoder.messages.Message`
"""
data = data.lstrip('\0')

if data is None:
raise InvalidMessageError()



BIN
docs/build/doctrees/environment.pickle View File


BIN
docs/build/html/objects.inv View File


+ 1
- 1
docs/build/html/searchindex.js
File diff suppressed because it is too large
View File


+ 1
- 1
setup.py View File

@@ -9,7 +9,7 @@ def readme():
return readme_file.read()

setup(name='alarmdecoder',
version='0.5',
version='0.6',
description='Python interface for the AlarmDecoder (AD2) family '
'of alarm devices which includes the AD2USB, AD2SERIAL and AD2PI.',
long_description=readme(),


+ 1
- 1
test/test_ad2.py View File

@@ -142,7 +142,7 @@ class TestAlarmDecoder(TestCase):
self.assertTrue(self._message_received)

def test_message_kpe(self):
msg = self._decoder._handle_message('!KPE:[0000000000000000----],000,[f707000600e5800c0c020000]," "')
msg = self._decoder._handle_message('!KPM:[0000000000000000----],000,[f707000600e5800c0c020000]," "')
self.assertIsInstance(msg, Message)

self._decoder._on_read(self, data='[0000000000000000----],000,[f707000600e5800c0c020000]," "')


Loading…
Cancel
Save