Revert "Silence an erroneous pylint warning inconsistent-return-state…

…ments."

This reverts commit bf62d58.

instruments/abstract_instruments/comm/file_communicator.py

@@ -109,8 +109,7 @@ def close(self):
         except IOError as e:  # pragma: no cover
             logger.warning("Failed to close file, exception: %s", repr(e))
 
-    def read_raw(self, size=-1):  # pylint: disable=inconsistent-return-statements
-        # TODO: Check if this can be reenabled when pylint>1.8.3 is released
+    def read_raw(self, size=-1):
         """
         Read bytes in from the file.
 

instruments/abstract_instruments/comm/serial_communicator.py

@@ -106,8 +106,7 @@ def close(self):
         finally:
             self._conn.close()
 
-    def read_raw(self, size=-1):  # pylint: disable=inconsistent-return-statements
-        # TODO: Check if this can be reenabled when pylint>1.8.3 is released
+    def read_raw(self, size=-1):
         """
         Read bytes in from the serial port.
 

instruments/abstract_instruments/comm/socket_communicator.py

@@ -95,8 +95,7 @@ def close(self):
         finally:
             self._conn.close()
 
-    def read_raw(self, size=-1):  # pylint: disable=inconsistent-return-statements
-        # TODO: Check if this can be reenabled when pylint>1.8.3 is released
+    def read_raw(self, size=-1):
         """
         Read bytes in from the socket connection.
 

instruments/abstract_instruments/instrument.py

@@ -256,8 +256,7 @@ def write(self, msg):
         """
         self._file.write(msg)
 
-    def binblockread(self, data_width, fmt=None):  # pylint: disable=inconsistent-return-statements
-        # TODO: Check if this can be reenabled when pylint>1.8.3 is released
+    def binblockread(self, data_width, fmt=None):
         """"
         Read a binary data block from attached instrument.
         This requires that the instrument respond in a particular manner