Merge pull request #54 from CatherineH/dev

fixed camel words issue with serial manager args, a little pep8 cleanup
instrumentkit · Jan 13, 2016 · 767536c · 767536c
2 parents af036ff + 58b81d0
commit 767536c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,3 +47,6 @@ nosetests.xml
 
 #Mr Developer
 .mr.developer.cfg
+
+#pycharm generated
+.idea
diff --git a/instruments/instruments/abstract_instruments/comm/serial_manager.py b/instruments/instruments/abstract_instruments/comm/serial_manager.py
@@ -53,6 +53,7 @@
 
 ## METHODS #####################################################################
 
+
 def new_serial_connection(port, baud=460800, timeout=3, write_timeout=3):
     if not isinstance(port,str):
         raise TypeError('Serial port must be specified as a string.')
@@ -62,7 +63,7 @@ def new_serial_connection(port, baud=460800, timeout=3, write_timeout=3):
                                          port,
                                          baudrate=baud,
                                          timeout=timeout,
-                                         writeTimeout=writeTimeout
+                                         writeTimeout=write_timeout
                                          ))
         serialObjDict[port] = conn
            # raise  'Serial connection error. Connection not added to serial \

diff --git a/instruments/instruments/tests/test_thorlabs/__init__.py b/instruments/instruments/tests/test_thorlabs/__init__.py
@@ -281,5 +281,4 @@ def test_sc10_restore():
         "resp\r",
         "\r1\r"
     ) as sc:
-        assert sc.restore()
-
+        assert sc.restore()
diff --git a/instruments/instruments/thorlabs/lcc25.py b/instruments/instruments/thorlabs/lcc25.py
@@ -98,6 +98,7 @@ def mode(self):
         response = self.check_command("mode?")
         if not response is "CMD_NOT_DEFINED":
             return LCC25.Mode[int(response)]
+
     @mode.setter
     def mode(self, newval):
         if (newval.enum is not LCC25.Mode):