diff options
| -rw-r--r-- | pint/context.py | 2 | ||||
| -rw-r--r-- | pint/definitions.py | 12 | ||||
| -rw-r--r-- | pint/errors.py | 10 | ||||
| -rw-r--r-- | pint/matplotlib.py | 4 | ||||
| -rw-r--r-- | pint/measurement.py | 2 | ||||
| -rw-r--r-- | pint/quantity.py | 2 | ||||
| -rw-r--r-- | pint/registry.py | 46 | ||||
| -rw-r--r-- | pint/testsuite/helpers.py | 2 | ||||
| -rw-r--r-- | pint/testsuite/test_application_registry.py | 6 | ||||
| -rw-r--r-- | pint/testsuite/test_unit.py | 2 | ||||
| -rw-r--r-- | pint/unit.py | 2 | ||||
| -rw-r--r-- | pint/util.py | 10 |
12 files changed, 49 insertions, 51 deletions
diff --git a/pint/context.py b/pint/context.py index d4d27b9..8157115 100644 --- a/pint/context.py +++ b/pint/context.py @@ -195,7 +195,7 @@ class ContextChain(ChainMap): """ def __init__(self, *args, **kwargs): - super(ContextChain, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self._graph = None self._contexts = [] diff --git a/pint/definitions.py b/pint/definitions.py index f180f7c..aefaf81 100644 --- a/pint/definitions.py +++ b/pint/definitions.py @@ -99,8 +99,7 @@ class PrefixDefinition(Definition): aliases = tuple(alias.strip('-') for alias in aliases) if symbol: symbol = symbol.strip('-') - super(PrefixDefinition, self).__init__(name, symbol, aliases, - converter) + super().__init__(name, symbol, aliases, converter) class UnitDefinition(Definition): @@ -139,7 +138,7 @@ class UnitDefinition(Definition): else: converter = ScaleConverter(converter.scale) - super(UnitDefinition, self).__init__(name, symbol, aliases, converter) + super().__init__(name, symbol, aliases, converter) class DimensionDefinition(Definition): @@ -162,14 +161,11 @@ class DimensionDefinition(Definition): 'to dimensions.') self.reference = UnitsContainer(converter) - super(DimensionDefinition, self).__init__(name, symbol, aliases, - converter=None) + super().__init__(name, symbol, aliases, converter=None) class AliasDefinition(Definition): """Additional alias(es) for an already existing unit """ def __init__(self, name, aliases): - super(AliasDefinition, self).__init__( - name=name, symbol=None, aliases=aliases, converter=None - ) + super().__init__(name=name, symbol=None, aliases=aliases, converter=None) diff --git a/pint/errors.py b/pint/errors.py index 1939dce..79aae36 100644 --- a/pint/errors.py +++ b/pint/errors.py @@ -15,7 +15,7 @@ class DefinitionSyntaxError(ValueError): """ def __init__(self, msg, filename=None, lineno=None): - super(DefinitionSyntaxError, self).__init__() + super().__init__() self.msg = msg self.filename = None self.lineno = None @@ -30,7 +30,7 @@ class RedefinitionError(ValueError): """ def __init__(self, name, definition_type): - super(RedefinitionError, self).__init__() + super().__init__() self.name = name self.definition_type = definition_type self.filename = None @@ -50,7 +50,7 @@ class UndefinedUnitError(AttributeError): """ def __init__(self, unit_names): - super(UndefinedUnitError, self).__init__() + super().__init__() self.unit_names = unit_names def __str__(self): @@ -73,7 +73,7 @@ class DimensionalityError(ValueError): """ def __init__(self, units1, units2, dim1=None, dim2=None, extra_msg=''): - super(DimensionalityError, self).__init__() + super().__init__() self.units1 = units1 self.units2 = units2 self.dim1 = dim1 @@ -97,7 +97,7 @@ class OffsetUnitCalculusError(ValueError): """Raised on ambiguous operations with offset units. """ def __init__(self, units1, units2='', extra_msg=''): - super(ValueError, self).__init__() + super().__init__() self.units1 = units1 self.units2 = units2 self.extra_msg = extra_msg diff --git a/pint/matplotlib.py b/pint/matplotlib.py index 67ffef8..49aad20 100644 --- a/pint/matplotlib.py +++ b/pint/matplotlib.py @@ -20,14 +20,14 @@ class PintAxisInfo(matplotlib.units.AxisInfo): def __init__(self, units): """Set the default label to the pretty-print of the unit.""" - super(PintAxisInfo, self).__init__(label='{:P}'.format(units)) + super().__init__(label='{:P}'.format(units)) class PintConverter(matplotlib.units.ConversionInterface): """Implement support for pint within matplotlib's unit conversion framework.""" def __init__(self, registry): - super(PintConverter, self).__init__() + super().__init__() self._reg = registry def convert(self, value, unit, axis): diff --git a/pint/measurement.py b/pint/measurement.py index 63f8744..55ed4b5 100644 --- a/pint/measurement.py +++ b/pint/measurement.py @@ -47,7 +47,7 @@ class Measurement(Quantity): else: mag = ufloat(value, error) - inst = super(Measurement, cls).__new__(cls, mag, units) + inst = super().__new__(cls, mag, units) return inst @property diff --git a/pint/quantity.py b/pint/quantity.py index 55a2fcf..d7108ba 100644 --- a/pint/quantity.py +++ b/pint/quantity.py @@ -265,7 +265,7 @@ class Quantity(PrettyIPython, SharedRegistryObject): def _repr_pretty_(self, p, cycle): if cycle: - super(Quantity, self)._repr_pretty_(p, cycle) + super()._repr_pretty_(p, cycle) else: p.pretty(self.magnitude) p.text(" ") diff --git a/pint/registry.py b/pint/registry.py index f6be018..8d2fc1b 100644 --- a/pint/registry.py +++ b/pint/registry.py @@ -903,7 +903,7 @@ class NonMultiplicativeRegistry(BaseRegistry): """ def __init__(self, default_as_delta=True, autoconvert_offset_to_baseunit=False, **kwargs): - super(NonMultiplicativeRegistry, self).__init__(**kwargs) + super().__init__(**kwargs) #: When performing a multiplication of units, interpret #: non-multiplicative units as their *delta* counterparts. @@ -919,7 +919,7 @@ class NonMultiplicativeRegistry(BaseRegistry): if as_delta is None: as_delta = self.default_as_delta - return super(NonMultiplicativeRegistry, self)._parse_units(input_string, as_delta) + return super()._parse_units(input_string, as_delta) def _define(self, definition): """Add unit to the registry. @@ -933,7 +933,7 @@ class NonMultiplicativeRegistry(BaseRegistry): :rtype: Definition, dict, dict """ - definition, d, di = super(NonMultiplicativeRegistry, self)._define(definition) + definition, d, di = super()._define(definition) # define additional units for units with an offset if getattr(definition.converter, "offset", 0.0) != 0.0: @@ -1012,7 +1012,7 @@ class NonMultiplicativeRegistry(BaseRegistry): raise DimensionalityError(src, dst, extra_msg=' - In destination units, %s ' % ex) if not (src_offset_unit or dst_offset_unit): - return super(NonMultiplicativeRegistry, self)._convert(value, src, dst, inplace) + return super()._convert(value, src, dst, inplace) src_dim = self._get_dimensionality(src) dst_dim = self._get_dimensionality(dst) @@ -1032,7 +1032,7 @@ class NonMultiplicativeRegistry(BaseRegistry): dst = dst.remove([dst_offset_unit]) # Convert non multiplicative units to the dst. - value = super(NonMultiplicativeRegistry, self)._convert(value, src, dst, inplace, False) + value = super()._convert(value, src, dst, inplace, False) # Finally convert to offset units specified in destination if dst_offset_unit: @@ -1056,7 +1056,7 @@ class ContextRegistry(BaseRegistry): """ def __init__(self, **kwargs): - super(ContextRegistry, self).__init__(**kwargs) + super().__init__(**kwargs) #: Map context name (string) or abbreviation to context. self._contexts = {} @@ -1065,7 +1065,7 @@ class ContextRegistry(BaseRegistry): self._active_ctx = ContextChain() def _register_parsers(self): - super(ContextRegistry, self)._register_parsers() + super()._register_parsers() self._register_parser('@context', self._parse_context) def _parse_context(self, ifile): @@ -1263,7 +1263,7 @@ class ContextRegistry(BaseRegistry): value, src = src._magnitude, src._units - return super(ContextRegistry, self)._convert(value, src, dst, inplace) + return super()._convert(value, src, dst, inplace) def _get_compatible_units(self, input_units, group_or_system): """ @@ -1271,7 +1271,7 @@ class ContextRegistry(BaseRegistry): src_dim = self._get_dimensionality(input_units) - ret = super(ContextRegistry, self)._get_compatible_units(input_units, group_or_system) + ret = super()._get_compatible_units(input_units, group_or_system) if self._active_ctx: nodes = find_connected_nodes(self._active_ctx.graph, src_dim) @@ -1298,7 +1298,7 @@ class SystemRegistry(BaseRegistry): """ def __init__(self, system=None, **kwargs): - super(SystemRegistry, self).__init__(**kwargs) + super().__init__(**kwargs) #: Map system name to system. #: :type: dict[ str | System] @@ -1314,7 +1314,7 @@ class SystemRegistry(BaseRegistry): self._default_system = system def _init_dynamic_classes(self): - super(SystemRegistry, self)._init_dynamic_classes() + super()._init_dynamic_classes() self.Group = systems.build_group_class(self) self.System = systems.build_system_class(self) @@ -1325,7 +1325,7 @@ class SystemRegistry(BaseRegistry): Add all orphan units to it. Set default system. """ - super(SystemRegistry, self)._after_init() + super()._after_init() #: Copy units not defined in any group to the default group if 'group' in self._defaults: @@ -1345,7 +1345,7 @@ class SystemRegistry(BaseRegistry): self._default_system = self._default_system or self._defaults.get('system', None) def _register_parsers(self): - super(SystemRegistry, self)._register_parsers() + super()._register_parsers() self._register_parser('@group', self._parse_group) self._register_parser('@system', self._parse_system) @@ -1408,7 +1408,7 @@ class SystemRegistry(BaseRegistry): # In addition to the what is done by the BaseRegistry, # this adds all units to the `root` group. - definition, d, di = super(SystemRegistry, self)._define(definition) + definition, d, di = super()._define(definition) if isinstance(definition, UnitDefinition): # We add all units to the root group @@ -1483,7 +1483,7 @@ class SystemRegistry(BaseRegistry): if group_or_system is None: group_or_system = self._default_system - ret = super(SystemRegistry, self)._get_compatible_units(input_units, group_or_system) + ret = super()._get_compatible_units(input_units, group_or_system) if group_or_system: if group_or_system in self._systems: @@ -1520,12 +1520,14 @@ class UnitRegistry(SystemRegistry, ContextRegistry, NonMultiplicativeRegistry): on_redefinition='warn', system=None, auto_reduce_dimensions=False): - super(UnitRegistry, self).__init__(filename=filename, force_ndarray=force_ndarray, - on_redefinition=on_redefinition, - default_as_delta=default_as_delta, - autoconvert_offset_to_baseunit=autoconvert_offset_to_baseunit, - system=system, - auto_reduce_dimensions=auto_reduce_dimensions) + super().__init__( + filename=filename, force_ndarray=force_ndarray, + on_redefinition=on_redefinition, + default_as_delta=default_as_delta, + autoconvert_offset_to_baseunit=autoconvert_offset_to_baseunit, + system=system, + auto_reduce_dimensions=auto_reduce_dimensions + ) def pi_theorem(self, quantities): """Builds dimensionless quantities using the Buckingham π theorem @@ -1569,7 +1571,7 @@ class LazyRegistry: def __setattr__(self, key, value): if key == '__class__': - super(LazyRegistry, self).__setattr__(key, value) + super().__setattr__(key, value) else: self.__init() setattr(self, key, value) diff --git a/pint/testsuite/helpers.py b/pint/testsuite/helpers.py index bf638bd..8902e90 100644 --- a/pint/testsuite/helpers.py +++ b/pint/testsuite/helpers.py @@ -53,7 +53,7 @@ _unit_re = re.compile('<Unit\((.*)\)>') class PintOutputChecker(doctest.OutputChecker): def check_output(self, want, got, optionflags): - check = super(PintOutputChecker, self).check_output(want, got, optionflags) + check = super().check_output(want, got, optionflags) if check: return check diff --git a/pint/testsuite/test_application_registry.py b/pint/testsuite/test_application_registry.py index f80162c..b0f77eb 100644 --- a/pint/testsuite/test_application_registry.py +++ b/pint/testsuite/test_application_registry.py @@ -86,7 +86,7 @@ class TestDefaultApplicationRegistry(BaseTestCase): class TestCustomApplicationRegistry(BaseTestCase): def setUp(self): - super(TestCustomApplicationRegistry, self).setUp() + super().setUp() self.ureg_bak = get_application_registry() self.ureg = UnitRegistry(None) self.ureg.define("foo = []") @@ -95,7 +95,7 @@ class TestCustomApplicationRegistry(BaseTestCase): assert get_application_registry() is self.ureg def tearDown(self): - super(TestCustomApplicationRegistry, self).tearDown() + super().tearDown() set_application_registry(self.ureg_bak) def test_unit(self): @@ -149,7 +149,7 @@ class TestSwapApplicationRegistry(BaseTestCase): """ def setUp(self): - super(TestSwapApplicationRegistry, self).setUp() + super().setUp() self.ureg_bak = get_application_registry() self.ureg1 = UnitRegistry(None) self.ureg1.define("foo = [dim1]") diff --git a/pint/testsuite/test_unit.py b/pint/testsuite/test_unit.py index 8bbe54c..2026c9a 100644 --- a/pint/testsuite/test_unit.py +++ b/pint/testsuite/test_unit.py @@ -515,7 +515,7 @@ class TestCompatibleUnits(QuantityTestCase): FORCE_NDARRAY = False def setUp(self): - super(TestCompatibleUnits, self).setUp() + super().setUp() self.ureg = UnitRegistry(force_ndarray=self.FORCE_NDARRAY) self.Q_ = self.ureg.Quantity self.U_ = self.ureg.Unit diff --git a/pint/unit.py b/pint/unit.py index 6d8b036..eda92d6 100644 --- a/pint/unit.py +++ b/pint/unit.py @@ -38,7 +38,7 @@ class Unit(PrettyIPython, SharedRegistryObject): return _unpickle, (Unit, self._units) def __init__(self, units): - super(Unit, self).__init__() + super().__init__() if isinstance(units, (UnitsContainer, UnitDefinition)): self._units = units elif isinstance(units, str): diff --git a/pint/util.py b/pint/util.py index 0ab29af..b5adb6a 100644 --- a/pint/util.py +++ b/pint/util.py @@ -421,7 +421,7 @@ class ParserHelper(UnitsContainer): __slots__ = ('scale', ) def __init__(self, scale=1, *args, **kwargs): - super(ParserHelper, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.scale = scale @classmethod @@ -487,7 +487,7 @@ class ParserHelper(UnitsContainer): ) def __copy__(self): - new = super(ParserHelper, self).__copy__() + new = super().__copy__() new.scale = self.scale return new @@ -498,7 +498,7 @@ class ParserHelper(UnitsContainer): if self.scale != 1.0: mess = 'Only scale 1.0 ParserHelper instance should be considered hashable' raise ValueError(mess) - return super(ParserHelper, self).__hash__() + return super().__hash__() # Only needed by Python 2.7 def __getstate__(self): @@ -511,14 +511,14 @@ class ParserHelper(UnitsContainer): if isinstance(other, ParserHelper): return ( self.scale == other.scale and - super(ParserHelper, self).__eq__(other) + super().__eq__(other) ) elif isinstance(other, str): return self == ParserHelper.from_string(other) elif isinstance(other, Number): return self.scale == other and not len(self._d) else: - return self.scale == 1. and super(ParserHelper, self).__eq__(other) + return self.scale == 1. and super().__eq__(other) def operate(self, items, op=operator.iadd, cleanup=True): d = udict(self._d) |