From 8f60f553c30fe54342f3f9cc89b16faeefb91a36 Mon Sep 17 00:00:00 2001
From: Ted Drain <ted.drain@gmail.com>
Date: Sun, 5 Nov 2017 16:25:03 -0800
Subject: [PATCH] Cleaning up for merge.

---
 alarmdecoder/decoder.py | 1 -
 test/test_devices.py    | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/alarmdecoder/decoder.py b/alarmdecoder/decoder.py
index 29e0465..f53a624 100644
--- a/alarmdecoder/decoder.py
+++ b/alarmdecoder/decoder.py
@@ -262,7 +262,6 @@ class AlarmDecoder(object):
         :param no_reader_thread: Specifies whether or not the automatic reader
                                  thread should be started.
         :type no_reader_thread: bool
-
         """
         self._wire_events()
         try:
diff --git a/test/test_devices.py b/test/test_devices.py
index a46b10a..604af8d 100644
--- a/test/test_devices.py
+++ b/test/test_devices.py
@@ -1,6 +1,11 @@
 from unittest import TestCase
 from mock import Mock, MagicMock, patch
 from serial import Serial, SerialException
+try:
+    from pyftdi.pyftdi.ftdi import Ftdi, FtdiError
+except:
+    from pyftdi.ftdi import Ftdi, FtdiError
+from usb.core import USBError, Device as USBCoreDevice
 import sys
 import socket
 import time