tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove old-style of super() calls

Browse Source
This commit is contained in:
Nicolas Évrard
2025-04-04 00:45:18 +02:00
parent 5781a49606
commit cbdad75620
350 changed files with 1235 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proteus/proteus/__init__.py
+34 -34
View File
@@ -21,7 +21,7 @@ class _EvalEnvironment(dict):
__slots__ = ('parent', 'eval_type')
def __init__(self, parent, eval_type='eval'):
super(_EvalEnvironment, self).__init__()
super().__init__()
self.parent = parent
assert eval_type in ('eval', 'on_change')
self.eval_type = eval_type
@@ -49,7 +49,7 @@ class _EvalEnvironment(dict):
return self.__getitem__(item)
except KeyError:
pass
return super(_EvalEnvironment, self).get(item, default)
return super().get(item, default)
def __bool__(self):
return True
@@ -109,7 +109,7 @@ class FieldDescriptor(object):
default = None
def __init__(self, name, definition):
super(FieldDescriptor, self).__init__()
super().__init__()
self.name = name
self.definition = definition
self.__doc__ = definition['string']
@@ -137,7 +137,7 @@ class BooleanDescriptor(FieldDescriptor):
def __set__(self, instance, value):
assert isinstance(value, bool)
super(BooleanDescriptor, self).__set__(instance, value)
super().__set__(instance, value)
class CharDescriptor(FieldDescriptor):
@@ -152,7 +152,7 @@ class CharDescriptor(FieldDescriptor):
value = value.rstrip()
else:
value = value.strip()
super(CharDescriptor, self).__set__(instance, value or '')
super().__set__(instance, value or '')
class BinaryDescriptor(FieldDescriptor):
@@ -160,14 +160,14 @@ class BinaryDescriptor(FieldDescriptor):
def __set__(self, instance, value):
assert isinstance(value, (bytes, bytearray)) or value is None
super(BinaryDescriptor, self).__set__(instance, value)
super().__set__(instance, value)
class IntegerDescriptor(FieldDescriptor):
def __set__(self, instance, value):
assert isinstance(value, (int, type(None)))
super(IntegerDescriptor, self).__set__(instance, value)
super().__set__(instance, value)
class FloatDescriptor(FieldDescriptor):
@@ -176,7 +176,7 @@ class FloatDescriptor(FieldDescriptor):
assert isinstance(value, (int, float, Decimal, type(None)))
if value is not None:
value = float(value)
super(FloatDescriptor, self).__set__(instance, value)
super().__set__(instance, value)
class NumericDescriptor(FieldDescriptor):
@@ -184,7 +184,7 @@ class NumericDescriptor(FieldDescriptor):
def __set__(self, instance, value):
assert isinstance(value, (type(None), Decimal))
# TODO add digits validation
super(NumericDescriptor, self).__set__(instance, value)
super().__set__(instance, value)
class SelectionDescriptor(FieldDescriptor):
@@ -205,7 +205,7 @@ class MultiSelectionDescriptor(FieldDescriptor):
class ReferenceDescriptor(FieldDescriptor):
def __get__(self, instance, owner):
value = super(ReferenceDescriptor, self).__get__(instance, owner)
value = super().__get__(instance, owner)
if isinstance(value, str):
model_name, id = value.split(',', 1)
if model_name:
@@ -223,12 +223,12 @@ class ReferenceDescriptor(FieldDescriptor):
assert value.startswith(',')
elif isinstance(value, Model):
assert value._config == instance._config
super(ReferenceDescriptor, self).__set__(instance, value)
super().__set__(instance, value)
class DateDescriptor(FieldDescriptor):
def __get__(self, instance, owner):
value = super(DateDescriptor, self).__get__(instance, owner)
value = super().__get__(instance, owner)
if isinstance(value, datetime.datetime):
value = value.date()
instance._values[self.name] = value
@@ -236,43 +236,43 @@ class DateDescriptor(FieldDescriptor):
def __set__(self, instance, value):
assert isinstance(value, datetime.date) or value is None
super(DateDescriptor, self).__set__(instance, value)
super().__set__(instance, value)
class DateTimeDescriptor(FieldDescriptor):
def __set__(self, instance, value):
assert isinstance(value, datetime.datetime) or value is None
super(DateTimeDescriptor, self).__set__(instance, value)
super().__set__(instance, value)
class TimeDescriptor(FieldDescriptor):
def __set__(self, instance, value):
assert isinstance(value, datetime.time) or value is None
super(TimeDescriptor, self).__set__(instance, value)
super().__set__(instance, value)
class TimeDeltaDescriptor(FieldDescriptor):
def __set__(self, instance, value):
assert isinstance(value, datetime.timedelta) or value is None
super(TimeDeltaDescriptor, self).__set__(instance, value)
super().__set__(instance, value)
class DictDescriptor(FieldDescriptor):
def __get__(self, instance, owner):
value = super(DictDescriptor, self).__get__(instance, owner)
value = super().__get__(instance, owner)
if value:
value = value.copy()
return value
def __set__(self, instance, value):
assert isinstance(value, dict) or value is None
super(DictDescriptor, self).__set__(instance, value)
super().__set__(instance, value)
class Many2OneDescriptor(FieldDescriptor):
def __get__(self, instance, owner):
Relation = Model.get(self.definition['relation'], instance._config)
value = super(Many2OneDescriptor, self).__get__(instance, owner)
value = super().__get__(instance, owner)
if isinstance(value, int):
config = Relation._config
with config.reset_context(), config.set_context(instance._context):
@@ -285,7 +285,7 @@ class Many2OneDescriptor(FieldDescriptor):
assert isinstance(value, (Model, type(None)))
if value:
assert value._config == instance._config
super(Many2OneDescriptor, self).__set__(instance, value)
super().__set__(instance, value)
class One2OneDescriptor(Many2OneDescriptor):
@@ -298,7 +298,7 @@ class One2ManyDescriptor(FieldDescriptor):
def __get__(self, instance, owner):
from .pyson import PYSONDecoder
Relation = Model.get(self.definition['relation'], instance._config)
value = super(One2ManyDescriptor, self).__get__(instance, owner)
value = super().__get__(instance, owner)
if not isinstance(value, ModelList):
ctx = instance._context.copy() if instance._context else {}
if self.definition.get('context'):
@@ -321,7 +321,7 @@ class Many2ManyDescriptor(One2ManyDescriptor):
class ValueDescriptor(object):
def __init__(self, name, definition):
super(ValueDescriptor, self).__init__()
super().__init__()
self.name = name
self.definition = definition
@@ -331,7 +331,7 @@ class ValueDescriptor(object):
class ReferenceValueDescriptor(ValueDescriptor):
def __get__(self, instance, owner):
value = super(ReferenceValueDescriptor, self).__get__(instance, owner)
value = super().__get__(instance, owner)
if isinstance(value, Model):
value = '%s,%s' % (value.__class__.__name__, value.id)
return value or None
@@ -339,7 +339,7 @@ class ReferenceValueDescriptor(ValueDescriptor):
class Many2OneValueDescriptor(ValueDescriptor):
def __get__(self, instance, owner):
value = super(Many2OneValueDescriptor, self).__get__(instance, owner)
value = super().__get__(instance, owner)
return value and value.id or None
@@ -385,7 +385,7 @@ class Many2ManyValueDescriptor(One2ManyValueDescriptor):
class EvalDescriptor(object):
def __init__(self, name, definition):
super(EvalDescriptor, self).__init__()
super().__init__()
self.name = name
self.definition = definition
@@ -395,7 +395,7 @@ class EvalDescriptor(object):
class ReferenceEvalDescriptor(EvalDescriptor):
def __get__(self, instance, owner):
value = super(ReferenceEvalDescriptor, self).__get__(instance, owner)
value = super().__get__(instance, owner)
if isinstance(value, Model):
value = '%s,%s' % (value.__class__.__name__, value.id)
return value or None
@@ -403,7 +403,7 @@ class ReferenceEvalDescriptor(EvalDescriptor):
class Many2OneEvalDescriptor(EvalDescriptor):
def __get__(self, instance, owner):
value = super(Many2OneEvalDescriptor, self).__get__(instance, owner)
value = super().__get__(instance, owner)
if value:
return value.id
return None
@@ -469,7 +469,7 @@ class MetaModelFactory(object):
}
def __init__(self, model_name, config=None):
super(MetaModelFactory, self).__init__()
super().__init__()
self.model_name = model_name
self.config = config or proteus.config.get_config()
@@ -537,7 +537,7 @@ class ModelList(list):
self.search_context = definition.get('search_context', '{}')
self.record_removed = set()
self.record_deleted = set()
result = super(ModelList, self).__init__(sequence)
result = super().__init__(sequence)
assert len(self) == len(set(self))
self.__check(self, on_change=False)
return result
@@ -605,7 +605,7 @@ class ModelList(list):
def pop(self, index=-1, _changed=True):
self.record_removed.add(self[index])
self[index]._group = None
res = super(ModelList, self).pop(index)
res = super().pop(index)
if _changed:
self._changed()
return res
@@ -615,7 +615,7 @@ class ModelList(list):
if record.id >= 0:
self.record_deleted.add(record)
record._group = None
res = super(ModelList, self).remove(record)
res = super().remove(record)
if _changed:
self._changed()
return res
@@ -698,7 +698,7 @@ class Model(object):
_fields = None
def __init__(self, id=None, _default=True, _group=None, **kwargs):
super(Model, self).__init__()
super().__init__()
if id is not None:
assert not kwargs
self.__id = id if id is not None else Model.__counter
@@ -1208,7 +1208,7 @@ class Wizard(object):
context=None):
if models:
assert len(set(type(x) for x in models)) == 1
super(Wizard, self).__init__()
super().__init__()
self.name = name
self.form = None
self.form_state = None
@@ -1287,7 +1287,7 @@ class Report(object):
__slots__ = ('name', '_config', '_context', '_proxy')
def __init__(self, name, config=None, context=None):
super(Report, self).__init__()
super().__init__()
self.name = name
self._config = config or proteus.config.get_config()
self._context = self._config.context
proteus/proteus/config.py
+6 -6
View File
@@ -143,7 +143,7 @@ class Config(object):
'Config interface'
def __init__(self):
super(Config, self).__init__()
super().__init__()
self._context = {}
@property
@@ -175,7 +175,7 @@ class Config(object):
class _TrytondMethod(object):
def __init__(self, name, model, config):
super(_TrytondMethod, self).__init__()
super().__init__()
self._name = name
self._object = model
self._config = config
@@ -238,7 +238,7 @@ class TrytondProxy(object):
'Proxy for function call for trytond'
def __init__(self, name, config, type='model'):
super(TrytondProxy, self).__init__()
super().__init__()
self._config = config
self._object = config.pool.get(name, type=type)
__init__.__doc__ = object.__init__.__doc__
@@ -252,7 +252,7 @@ class TrytondConfig(Config):
'Configuration for trytond'
def __init__(self, database=None, user='admin', config_file=None):
super(TrytondConfig, self).__init__()
super().__init__()
if not database:
database = os.environ.get('TRYTOND_DATABASE_URI')
elif (os.environ.get('TRYTOND_DATABASE_URI')
@@ -337,7 +337,7 @@ class XmlrpcProxy(object):
'Proxy for function call for XML-RPC'
def __init__(self, name, config, type='model'):
super(XmlrpcProxy, self).__init__()
super().__init__()
self._config = config
self._object = getattr(config.server, '%s.%s' % (type, name))
__init__.__doc__ = object.__init__.__doc__
@@ -351,7 +351,7 @@ class XmlrpcConfig(Config):
'Configuration for XML-RPC'
def __init__(self, url, **kwargs):
super(XmlrpcConfig, self).__init__()
super().__init__()
self.url = url
self.server = xmlrpc.client.ServerProxy(
url, allow_none=True, use_builtin_types=True, **kwargs)
proteus/proteus/pyson.py
+18 -18
View File
@@ -105,7 +105,7 @@ class PYSONEncoder(json.JSONEncoder):
return TimeDelta(obj.days, obj.seconds, obj.microseconds)
elif isinstance(obj, Decimal):
return float(obj)
return super(PYSONEncoder, self).default(obj)
return super().default(obj)
class PYSONDecoder(json.JSONDecoder):
@@ -113,7 +113,7 @@ class PYSONDecoder(json.JSONDecoder):
def __init__(self, context=None, noeval=False):
self.__context = context or {}
self.noeval = noeval
super(PYSONDecoder, self).__init__(object_hook=self._object_hook)
super().__init__(object_hook=self._object_hook)
def _object_hook(self, dct):
if '__class__' in dct:
@@ -131,7 +131,7 @@ class PYSONDecoder(json.JSONDecoder):
class Eval(PYSON):
def __init__(self, v, d=''):
super(Eval, self).__init__()
super().__init__()
self._value = v
self._default = d
@@ -175,7 +175,7 @@ class Eval(PYSON):
class Not(PYSON):
def __init__(self, v):
super(Not, self).__init__()
super().__init__()
if isinstance(v, PYSON):
if v.types() != {bool}:
v = Bool(v)
@@ -204,7 +204,7 @@ class Not(PYSON):
class Bool(PYSON):
def __init__(self, v):
super(Bool, self).__init__()
super().__init__()
self._value = v
@property
@@ -228,7 +228,7 @@ class Bool(PYSON):
class And(PYSON):
def __init__(self, *statements, **kwargs):
super(And, self).__init__()
super().__init__()
statements = list(statements) + kwargs.get('s', [])
for i, statement in enumerate(list(statements)):
if isinstance(statement, PYSON):
@@ -260,7 +260,7 @@ class And(PYSON):
class Or(And):
def pyson(self):
res = super(Or, self).pyson()
res = super().pyson()
res['__class__'] = 'Or'
return res
@@ -273,7 +273,7 @@ class Equal(PYSON):
def __init__(self, s1, s2):
statement1, statement2 = s1, s2
super(Equal, self).__init__()
super().__init__()
if isinstance(statement1, PYSON):
types1 = statement1.types()
else:
@@ -309,7 +309,7 @@ class Greater(PYSON):
def __init__(self, s1, s2, e=False):
statement1, statement2, equal = s1, s2, e
super(Greater, self).__init__()
super().__init__()
for i in (statement1, statement2):
if isinstance(i, PYSON):
assert i.types().issubset({
@@ -379,7 +379,7 @@ class Greater(PYSON):
class Less(Greater):
def pyson(self):
res = super(Less, self).pyson()
res = super().pyson()
res['__class__'] = 'Less'
return res
@@ -398,7 +398,7 @@ class If(PYSON):
def __init__(self, c, t, e=None):
condition, then_statement, else_statement = c, t, e
super(If, self).__init__()
super().__init__()
if isinstance(condition, PYSON):
if condition.types() != {bool}:
condition = Bool(condition)
@@ -443,7 +443,7 @@ class Get(PYSON):
def __init__(self, v, k, d=''):
obj, key, default = v, k, d
super(Get, self).__init__()
super().__init__()
if isinstance(obj, PYSON):
assert obj.types() == {dict}, 'obj must be a dict'
else:
@@ -483,7 +483,7 @@ class In(PYSON):
def __init__(self, k, v):
key, obj = k, v
super(In, self).__init__()
super().__init__()
if isinstance(key, PYSON):
assert key.types().issubset({str, int}), \
'key must be a string or an integer or a long'
@@ -540,7 +540,7 @@ class Date(PYSON):
delta_years = kwargs.get('dy', delta_years)
delta_months = kwargs.get('dM', delta_months)
delta_days = kwargs.get('dd', delta_days)
super(Date, self).__init__()
super().__init__()
for i in (year, month, day, delta_years, delta_months, delta_days):
if isinstance(i, PYSON):
assert i.types().issubset({int, type(None)}), \
@@ -609,7 +609,7 @@ class DateTime(Date):
delta_minutes = kwargs.get('dm', delta_minutes)
delta_seconds = kwargs.get('ds', delta_seconds)
delta_microseconds = kwargs.get('dms', delta_microseconds)
super(DateTime, self).__init__(year=year, month=month, day=day,
super().__init__(year=year, month=month, day=day,
delta_years=delta_years, delta_months=delta_months,
delta_days=delta_days, start=start, **kwargs)
for i in (hour, minute, second, microsecond,
@@ -631,7 +631,7 @@ class DateTime(Date):
@property
def __repr_params__(self):
date_params = super(DateTime, self).__repr_params__
date_params = super().__repr_params__
return (date_params[:3]
+ (self._hour, self._minute, self._second, self._microsecond)
+ date_params[3:-1]
@@ -640,7 +640,7 @@ class DateTime(Date):
+ date_params[-1:])
def pyson(self):
res = super(DateTime, self).pyson()
res = super().pyson()
res['__class__'] = 'DateTime'
res['h'] = self._hour
res['m'] = self._minute
@@ -723,7 +723,7 @@ class TimeDelta(PYSON):
class Len(PYSON):
def __init__(self, v):
super(Len, self).__init__()
super().__init__()
if isinstance(v, PYSON):
assert v.types().issubset({dict, list, str}), \
'value must be a dict or a list or a string'