Merge branch 'master' into issue_640

pytorch · Aug 27, 2020 · f4b6dc9 · f4b6dc9
2 parents e36f76f + 7e84927
commit f4b6dc9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/model-archiver/model_archiver/model_archiver_error.py b/model-archiver/model_archiver/model_archiver_error.py
@@ -9,4 +9,4 @@ class ModelArchiverError(Exception):
     Error for Model Archiver module
     """
     def __init__(self, message):
-        super(ModelArchiverError, self).__init__(message)
+        super().__init__(message)
diff --git a/ts/model_service_worker.py b/ts/model_service_worker.py
@@ -37,9 +37,9 @@ def __init__(self, s_type=None, s_name=None, host_addr=None, port_num=None):
             self.sock_name, self.port = s_name, -1
             try:
                 os.remove(s_name)
-            except OSError:
+            except OSError as e :
                 if os.path.exists(s_name):
-                    raise RuntimeError("socket already in use: {}.".format(s_name))
+                    raise RuntimeError("socket already in use: {}.".format(s_name)) from e
 
         elif s_type == "tcp":
             self.sock_name = host_addr if host_addr is not None else "127.0.0.1"

diff --git a/ts/torch_handler/object_detector.py b/ts/torch_handler/object_detector.py
@@ -19,7 +19,7 @@ class ObjectDetector(VisionHandler):
     threshold = 0.5
 
     def initialize(self, context):
-        super(ObjectDetector, self).initialize(context)
+        super().initialize(context)
 
         # Torchvision breaks with object detector models before 0.6.0
         if version.parse(torchvision_version) < version.parse("0.6.0"):

diff --git a/ts/torch_handler/text_handler.py b/ts/torch_handler/text_handler.py
@@ -1,5 +1,3 @@
-# pylint: disable=W0223
-# Details : https://github.com/PyCQA/pylint/issues/3098
 """
 Base module for all text based default handler.
 Contains various text based utility methods
@@ -26,12 +24,12 @@ class TextHandler(BaseHandler, ABC):
     Contains various text based utility methods
     """
     def __init__(self):
-        super(TextHandler, self).__init__()
+        super().__init__()
         self.source_vocab = None
         self.tokenizer = get_tokenizer('basic_english')
 
     def initialize(self, context):
-        super(TextHandler, self).initialize(context)
+        super().initialize(context)
         self.initialized = False
         source_vocab = self.manifest['model']['sourceVocab'] if 'sourceVocab' in self.manifest['model'] else None
         if source_vocab: