use python3 version of

lsst-dm · Sep 14, 2017 · 01765e6 · 01765e6
1 parent ee03f11
commit 01765e6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/python/lsst/daf/persistence/access.py b/python/lsst/daf/persistence/access.py
@@ -31,7 +31,7 @@ class AccessCfg(Policy, yaml.YAMLObject):
     yaml_tag = u"!AccessCfg"
 
     def __init__(self, cls, storageCfg):
-        super(AccessCfg, self).__init__({'storageCfg': storageCfg, 'cls': cls})
+        super().__init__({'storageCfg': storageCfg, 'cls': cls})
 
 
 class Access(object):

diff --git a/python/lsst/daf/persistence/butler.py b/python/lsst/daf/persistence/butler.py
@@ -60,7 +60,7 @@ class ButlerCfg(Policy, yaml.YAMLObject):
     yaml_tag = u"!ButlerCfg"
 
     def __init__(self, cls, repoCfg):
-        super(ButlerCfg, self).__init__({'repoCfg': repoCfg, 'cls': cls})
+        super().__init__({'repoCfg': repoCfg, 'cls': cls})
 
 
 class RepoData(object):

diff --git a/python/lsst/daf/persistence/butlerExceptions.py b/python/lsst/daf/persistence/butlerExceptions.py
@@ -30,7 +30,7 @@ class NoResults(RuntimeError):
 
     def __init__(self, message, datasetType, dataId):
         message += ' datasetType:' + datasetType + ' dataId:' + str(dataId)
-        super(NoResults, self).__init__(message)
+        super().__init__(message)
 
 
 class MultipleResults(RuntimeError):
@@ -39,7 +39,7 @@ def __init__(self, message, datasetType, dataId, locations):
         message += ' datasetType:' + datasetType + ' dataId:' + str(dataId) + ' locations:'
         for location in locations:
             message += ' ' + str(location)
-        super(MultipleResults, self).__init__(message)
+        super().__init__(message)
         self.locations = locations
 
 
@@ -48,4 +48,4 @@ class ParentsMismatch(RuntimeError):
     value.
     """
     def __init__(self, message):
-        super(ParentsMismatch, self).__init__(message)
+        super().__init__(message)
diff --git a/python/lsst/daf/persistence/mapper.py b/python/lsst/daf/persistence/mapper.py
@@ -94,7 +94,7 @@ def __new__(cls, *args, **kwargs):
         responsibility (except when overriding __new__, but that
         is not common).
         """
-        self = super(Mapper, cls).__new__(cls)
+        self = super().__new__(cls)
         self._arguments = (args, kwargs)
         return self
 

diff --git a/python/lsst/daf/persistence/registries.py b/python/lsst/daf/persistence/registries.py
@@ -33,7 +33,6 @@
 local filesystem only, so this works for the time being.
 """
 from __future__ import absolute_import
-from builtins import object, super
 from past.builtins import basestring
 
 import copy

diff --git a/tests/test_reposInButler.py b/tests/test_reposInButler.py
@@ -65,7 +65,7 @@ class MapperTestCfg(Policy, yaml.YAMLObject):
     yaml_tag = u"!MapperTestCfg"
 
     def __init__(self, cls, root):
-        super(MapperTestCfg, self).__init__({'root': root, 'cls': cls})
+        super().__init__({'root': root, 'cls': cls})
 
 
 class MapperTest(dp.Mapper):
@@ -75,7 +75,7 @@ def cfg(cls, root=None):
         return MapperTestCfg(cls=cls, root=root)
 
     def __init__(self, cfg):
-        super(MapperTest, self).__init__()
+        super().__init__()
         # self.root = cfg['root']
         self.storage = cfg['storage']
         self.cfg = cfg