changeset e71e01ffc949 in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset;node=e71e01ffc949
description:
Rationalize import path
We use absolute path when imported module is from a different context.
And we remove unnecessary __all__ definition.
issue9466
review323591002
diffstat:
trytond/convert.py | 8 ++++----
trytond/ir/__init__.py | 2 +-
trytond/ir/action.py | 24 +++++++++---------------
trytond/ir/attachment.py | 8 ++++----
trytond/ir/cache.py | 6 +-----
trytond/ir/calendar_.py | 8 ++++----
trytond/ir/configuration.py | 8 +++-----
trytond/ir/cron.py | 7 ++++---
trytond/ir/date.py | 8 ++------
trytond/ir/export.py | 2 +-
trytond/ir/lang.py | 18 +++++++++---------
trytond/ir/message.py | 4 +---
trytond/ir/model.py | 31 +++++++++++++------------------
trytond/ir/module.py | 8 --------
trytond/ir/note.py | 10 +++++-----
trytond/ir/resource.py | 8 ++++----
trytond/ir/rule.py | 14 +++++---------
trytond/ir/sequence.py | 16 ++++++----------
trytond/ir/session.py | 4 ----
trytond/ir/translation.py | 28 ++++++++++------------------
trytond/ir/trigger.py | 20 ++++++++------------
trytond/ir/ui/icon.py | 4 ----
trytond/ir/ui/menu.py | 4 ----
trytond/ir/ui/view.py | 5 -----
trytond/model/fields/binary.py | 6 +++---
trytond/model/fields/char.py | 2 +-
trytond/model/fields/date.py | 2 +-
trytond/model/fields/dict.py | 6 +++---
trytond/model/fields/field.py | 9 ++++-----
trytond/model/fields/float.py | 3 +--
trytond/model/fields/many2many.py | 6 +++---
trytond/model/fields/many2one.py | 6 +++---
trytond/model/fields/numeric.py | 2 +-
trytond/model/fields/one2many.py | 6 +++---
trytond/model/fields/reference.py | 8 ++++----
trytond/model/fields/selection.py | 6 +++---
trytond/model/multivalue.py | 2 +-
trytond/res/__init__.py | 2 +-
trytond/res/group.py | 6 +++---
trytond/res/ir.py | 4 ++--
trytond/res/user.py | 25 ++++++++++---------------
trytond/sendmail.py | 4 ++--
trytond/tools/misc.py | 2 +-
43 files changed, 144 insertions(+), 218 deletions(-)
diffs (842 lines):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/convert.py
--- a/trytond/convert.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/convert.py Tue Jul 21 14:38:36 2020 +0200
@@ -9,10 +9,10 @@
from collections import defaultdict
from decimal import Decimal
-from . import __version__
-from .tools import grouped_slice
-from .transaction import Transaction
-from .pyson import PYSONEncoder, CONTEXT
+from trytond import __version__
+from trytond.pyson import PYSONEncoder, CONTEXT
+from trytond.tools import grouped_slice
+from trytond.transaction import Transaction
logger = logging.getLogger(__name__)
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/__init__.py
--- a/trytond/ir/__init__.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/__init__.py Tue Jul 21 14:38:36 2020 +0200
@@ -1,6 +1,6 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from ..pool import Pool
+from trytond.pool import Pool
from . import configuration
from . import translation
from . import sequence
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/action.py
--- a/trytond/ir/action.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/action.py Tue Jul 21 14:38:36 2020 +0200
@@ -7,25 +7,19 @@
from sql import Null
+from trytond.cache import Cache
from trytond.config import config
from trytond.i18n import gettext
-from trytond.model.exceptions import ValidationError
-from trytond.pyson import PYSONEncoder
-from ..model import (
+from trytond.model import (
ModelView, ModelStorage, ModelSQL, DeactivableMixin, fields,
sequence_ordered)
-from ..tools import file_open
-from ..pyson import PYSONDecoder, PYSON, Eval
-from ..transaction import Transaction
-from ..pool import Pool
-from ..cache import Cache
-from ..rpc import RPC
-
-__all__ = [
- 'Action', 'ActionKeyword', 'ActionReport',
- 'ActionActWindow', 'ActionActWindowView', 'ActionActWindowDomain',
- 'ActionWizard', 'ActionURL',
- ]
+from trytond.model.exceptions import ValidationError
+from trytond.pool import Pool
+from trytond.pyson import PYSONDecoder, PYSON, Eval
+from trytond.pyson import PYSONEncoder
+from trytond.rpc import RPC
+from trytond.tools import file_open
+from trytond.transaction import Transaction
if not config.get('html', 'plugins-ir.action.report-report_content_html'):
config.set(
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/attachment.py
--- a/trytond/ir/attachment.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/attachment.py Tue Jul 21 14:38:36 2020 +0200
@@ -3,12 +3,12 @@
from sql import Null
from sql.operators import Concat
+from trytond.config import config
from trytond.i18n import lazy_gettext
-from ..model import ModelView, ModelSQL, fields
-from ..transaction import Transaction
-from ..pyson import Eval
+from trytond.model import ModelView, ModelSQL, fields
+from trytond.pyson import Eval
+from trytond.transaction import Transaction
from .resource import ResourceMixin, resource_copy
-from ..config import config
__all__ = ['AttachmentCopyMixin']
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/cache.py
--- a/trytond/ir/cache.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/cache.py Tue Jul 21 14:38:36 2020 +0200
@@ -1,10 +1,6 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from ..model import ModelSQL, fields
-
-__all__ = [
- 'Cache',
- ]
+from trytond.model import ModelSQL, fields
class Cache(ModelSQL):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/calendar_.py
--- a/trytond/ir/calendar_.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/calendar_.py Tue Jul 21 14:38:36 2020 +0200
@@ -1,10 +1,10 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from ..cache import Cache
-from ..model import ModelSQL, fields, Unique
-from ..rpc import RPC
-from ..transaction import Transaction
+from trytond.cache import Cache
+from trytond.model import ModelSQL, fields, Unique
+from trytond.rpc import RPC
+from trytond.transaction import Transaction
class _Calendar(ModelSQL):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/configuration.py
--- a/trytond/ir/configuration.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/configuration.py Tue Jul 21 14:38:36 2020 +0200
@@ -1,10 +1,8 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from ..model import ModelSQL, ModelSingleton, fields
-from ..cache import Cache
-from ..config import config
-
-__all__ = ['Configuration']
+from trytond.cache import Cache
+from trytond.config import config
+from trytond.model import ModelSQL, ModelSingleton, fields
class Configuration(ModelSingleton, ModelSQL):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/cron.py
--- a/trytond/ir/cron.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/cron.py Tue Jul 21 14:38:36 2020 +0200
@@ -5,12 +5,13 @@
from dateutil.relativedelta import relativedelta
import logging
-from ..model import ModelView, ModelSQL, DeactivableMixin, fields, dualmethod
-from ..transaction import Transaction
-from ..pool import Pool
from trytond import backend
from trytond.config import config
+from trytond.model import (
+ ModelView, ModelSQL, DeactivableMixin, fields, dualmethod)
+from trytond.pool import Pool
from trytond.pyson import Eval
+from trytond.transaction import Transaction
from trytond.worker import run_task
logger = logging.getLogger(__name__)
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/date.py
--- a/trytond/ir/date.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/date.py Tue Jul 21 14:38:36 2020 +0200
@@ -2,12 +2,8 @@
# this repository contains the full copyright notices and license terms.
import datetime
-from ..model import Model
-from ..rpc import RPC
-
-__all__ = [
- 'Date',
- ]
+from trytond.model import Model
+from trytond.rpc import RPC
class Date(Model):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/export.py
--- a/trytond/ir/export.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/export.py Tue Jul 21 14:38:36 2020 +0200
@@ -1,7 +1,7 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
"Exports"
-from ..model import ModelView, ModelSQL, fields
+from trytond.model import ModelView, ModelSQL, fields
from trytond.pool import Pool
from trytond.rpc import RPC
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/lang.py
--- a/trytond/ir/lang.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/lang.py Tue Jul 21 14:38:36 2020 +0200
@@ -7,15 +7,15 @@
from sql import Table
-from ..model import ModelView, ModelSQL, DeactivableMixin, fields, Check
-from ..modules import create_graph, load_translations
-from ..cache import Cache
-from ..transaction import Transaction
-from ..pool import Pool
-from ..pyson import Eval
-from ..exceptions import UserError
-from ..i18n import gettext
-from ..wizard import Wizard, StateView, Button, StateTransition
+from trytond.cache import Cache
+from trytond.exceptions import UserError
+from trytond.i18n import gettext
+from trytond.model import ModelView, ModelSQL, DeactivableMixin, fields, Check
+from trytond.modules import create_graph, load_translations
+from trytond.pool import Pool
+from trytond.pyson import Eval
+from trytond.transaction import Transaction
+from trytond.wizard import Wizard, StateView, Button, StateTransition
Transaction.cache_keys.add('translate_name')
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/message.py
--- a/trytond/ir/message.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/message.py Tue Jul 21 14:38:36 2020 +0200
@@ -1,13 +1,11 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from ..model import ModelView, ModelSQL, fields
+from trytond.model import ModelView, ModelSQL, fields
from trytond.cache import Cache
from trytond.pool import Pool
from trytond.transaction import Transaction
-__all__ = ['Message']
-
class Message(ModelSQL, ModelView):
"Message"
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/model.py
--- a/trytond/ir/model.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/model.py Tue Jul 21 14:38:36 2020 +0200
@@ -11,27 +11,22 @@
from collections import defaultdict
from itertools import groupby
+from trytond.cache import Cache
from trytond.i18n import gettext
+from trytond.model import (
+ ModelView, ModelSQL, Workflow, DeactivableMixin, fields, Unique,
+ EvalEnvironment)
from trytond.model.exceptions import AccessError, ValidationError
-from ..model import (ModelView, ModelSQL, Workflow, DeactivableMixin, fields,
- Unique, EvalEnvironment)
-from ..report import Report
-from ..wizard import Wizard, StateView, StateAction, Button
-from ..transaction import Transaction
-from ..cache import Cache
-from ..pool import Pool
-from ..pyson import Bool, Eval, PYSONDecoder
-from ..rpc import RPC
-from ..protocols.jsonrpc import JSONDecoder, JSONEncoder
-from ..tools import is_instance_method, cursor_dict, grouped_slice
-from ..tools.string_ import StringMatcher
+from trytond.pool import Pool
+from trytond.protocols.jsonrpc import JSONDecoder, JSONEncoder
+from trytond.pyson import Bool, Eval, PYSONDecoder
+from trytond.report import Report
+from trytond.rpc import RPC
+from trytond.tools import is_instance_method, cursor_dict, grouped_slice
+from trytond.tools.string_ import StringMatcher
+from trytond.transaction import Transaction
+from trytond.wizard import Wizard, StateView, StateAction, Button
-__all__ = [
- 'Model', 'ModelField', 'ModelAccess', 'ModelFieldAccess', 'ModelButton',
- 'ModelButtonRule', 'ModelButtonClick', 'ModelButtonReset',
- 'ModelData', 'PrintModelGraphStart', 'PrintModelGraph', 'ModelGraph',
- 'ModelWorkflowGraph',
- ]
logger = logging.getLogger(__name__)
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/module.py
--- a/trytond/ir/module.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/module.py Tue Jul 21 14:38:36 2020 +0200
@@ -18,14 +18,6 @@
from trytond.pyson import Eval
from trytond.rpc import RPC
-__all__ = [
- 'Module', 'ModuleDependency', 'ModuleConfigWizardItem',
- 'ModuleConfigWizardFirst', 'ModuleConfigWizardOther',
- 'ModuleConfigWizardDone', 'ModuleConfigWizard',
- 'ModuleActivateUpgradeStart', 'ModuleActivateUpgradeDone',
- 'ModuleActivateUpgrade', 'ModuleConfig',
- ]
-
class DeactivateDependencyError(UserError):
pass
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/note.py
--- a/trytond/ir/note.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/note.py Tue Jul 21 14:38:36 2020 +0200
@@ -6,11 +6,11 @@
from sql.conditionals import Case
from trytond.i18n import lazy_gettext
-from ..model import ModelView, ModelSQL, ModelStorage, fields
-from ..pool import Pool
-from ..transaction import Transaction
-from ..tools import grouped_slice, reduce_ids
-from ..pyson import Eval
+from trytond.model import ModelView, ModelSQL, ModelStorage, fields
+from trytond.pool import Pool
+from trytond.pyson import Eval
+from trytond.tools import grouped_slice, reduce_ids
+from trytond.transaction import Transaction
from .resource import ResourceMixin, resource_copy
__all__ = ['NoteCopyMixin']
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/resource.py
--- a/trytond/ir/resource.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/resource.py Tue Jul 21 14:38:36 2020 +0200
@@ -3,10 +3,10 @@
from sql.conditionals import Coalesce
from trytond.i18n import lazy_gettext
-from ..model import ModelStorage, ModelView, fields
-from ..pool import Pool
-from ..transaction import Transaction
-from ..pyson import Eval
+from trytond.model import ModelStorage, ModelView, fields
+from trytond.pool import Pool
+from trytond.pyson import Eval
+from trytond.transaction import Transaction
__all__ = ['ResourceMixin', 'resource_copy']
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/rule.py
--- a/trytond/ir/rule.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/rule.py Tue Jul 21 14:38:36 2020 +0200
@@ -4,17 +4,13 @@
from sql import Literal
+from trytond.cache import Cache
from trytond.i18n import gettext
+from trytond.model import ModelView, ModelSQL, fields, EvalEnvironment, Check
from trytond.model.exceptions import ValidationError
-from ..model import ModelView, ModelSQL, fields, EvalEnvironment, Check
-from ..transaction import Transaction
-from ..cache import Cache
-from ..pool import Pool
-from ..pyson import PYSONDecoder
-
-__all__ = [
- 'RuleGroup', 'Rule',
- ]
+from trytond.pool import Pool
+from trytond.pyson import PYSONDecoder
+from trytond.transaction import Transaction
class DomainError(ValidationError):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/sequence.py
--- a/trytond/ir/sequence.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/sequence.py Tue Jul 21 14:38:36 2020 +0200
@@ -5,18 +5,14 @@
from sql import Literal, For
+from trytond import backend
from trytond.exceptions import UserError
+from trytond.i18n import gettext
+from trytond.model import ModelView, ModelSQL, DeactivableMixin, fields, Check
from trytond.model.exceptions import ValidationError
-from ..model import ModelView, ModelSQL, DeactivableMixin, fields, Check
-from ..pyson import Eval, And
-from ..transaction import Transaction
-from ..pool import Pool
-from ..i18n import gettext
-from .. import backend
-
-__all__ = [
- 'SequenceType', 'Sequence', 'SequenceStrict',
- ]
+from trytond.pool import Pool
+from trytond.pyson import Eval, And
+from trytond.transaction import Transaction
sql_sequence = backend.Database.has_sequence()
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/session.py
--- a/trytond/ir/session.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/session.py Tue Jul 21 14:38:36 2020 +0200
@@ -15,10 +15,6 @@
from trytond.model import ModelSQL, fields
from trytond.config import config
-__all__ = [
- 'Session', 'SessionWizard',
- ]
-
class Session(ModelSQL):
"Session"
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/translation.py
--- a/trytond/ir/translation.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/translation.py Tue Jul 21 14:38:36 2020 +0200
@@ -17,28 +17,20 @@
from relatorio.reporting import MIMETemplateLoader
from relatorio.templates.opendocument import get_zip_file
+from trytond.cache import Cache
+from trytond.config import config
from trytond.exceptions import UserError
from trytond.i18n import gettext
+from trytond.model import ModelView, ModelSQL, fields
+from trytond.pool import Pool
+from trytond.pyson import PYSONEncoder, Eval
+from trytond.tools import file_open, grouped_slice, cursor_dict
from trytond.tools.string_ import LazyString
-from ..model import ModelView, ModelSQL, fields
-from ..wizard import Wizard, StateView, StateTransition, StateAction, \
- Button
-from ..tools import file_open, grouped_slice, cursor_dict
-from ..pyson import PYSONEncoder, Eval
-from ..transaction import Transaction
-from ..pool import Pool
-from ..cache import Cache
-from ..config import config
+from trytond.transaction import Transaction
+from trytond.wizard import (
+ Wizard, StateView, StateTransition, StateAction, Button)
-from trytond.ir.lang import get_parent_language as get_parent
-
-__all__ = ['Translation',
- 'TranslationSetStart', 'TranslationSetSucceed', 'TranslationSet',
- 'TranslationCleanStart', 'TranslationCleanSucceed', 'TranslationClean',
- 'TranslationUpdateStart', 'TranslationUpdate',
- 'TranslationExportStart', 'TranslationExportResult', 'TranslationExport',
- 'TranslationReport',
- ]
+from .lang import get_parent_language as get_parent
TRANSLATION_TYPE = [
('field', 'Field'),
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/trigger.py
--- a/trytond/ir/trigger.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/trigger.py Tue Jul 21 14:38:36 2020 +0200
@@ -7,20 +7,16 @@
from sql.functions import CurrentTimestamp
from sql.operators import Concat
-from trytond.model.exceptions import ValidationError
+from trytond.cache import Cache
from trytond.i18n import gettext
-from ..model import (
+from trytond.model import (
ModelView, ModelSQL, DeactivableMixin, fields, EvalEnvironment, Check)
-from ..pyson import Eval, PYSONDecoder
-from ..tools import grouped_slice
-from ..tools import reduce_ids
-from ..transaction import Transaction
-from ..cache import Cache
-from ..pool import Pool
-
-__all__ = [
- 'Trigger', 'TriggerLog',
- ]
+from trytond.model.exceptions import ValidationError
+from trytond.pool import Pool
+from trytond.pyson import Eval, PYSONDecoder
+from trytond.tools import grouped_slice
+from trytond.tools import reduce_ids
+from trytond.transaction import Transaction
class ConditionError(ValidationError):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/ui/icon.py
--- a/trytond/ir/ui/icon.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/ui/icon.py Tue Jul 21 14:38:36 2020 +0200
@@ -8,10 +8,6 @@
from trytond.transaction import Transaction
from trytond.rpc import RPC
-__all__ = [
- 'Icon',
- ]
-
class Icon(sequence_ordered(), ModelSQL, ModelView):
'Icon'
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/ui/menu.py
--- a/trytond/ir/ui/menu.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/ui/menu.py Tue Jul 21 14:38:36 2020 +0200
@@ -9,10 +9,6 @@
from trytond.pool import Pool
from trytond.rpc import RPC
-__all__ = [
- 'UIMenu', 'UIMenuFavorite',
- ]
-
def one_in(i, j):
"""Check the presence of an element of setA in setB
diff -r 360951b6b5cd -r e71e01ffc949 trytond/ir/ui/view.py
--- a/trytond/ir/ui/view.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/ir/ui/view.py Tue Jul 21 14:38:36 2020 +0200
@@ -17,11 +17,6 @@
from trytond.cache import Cache
from trytond.rpc import RPC
-__all__ = [
- 'View', 'ShowViewStart', 'ShowView',
- 'ViewTreeWidth', 'ViewTreeState', 'ViewSearch',
- ]
-
logger = logging.getLogger(__name__)
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/fields/binary.py
--- a/trytond/model/fields/binary.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/fields/binary.py Tue Jul 21 14:38:36 2020 +0200
@@ -2,10 +2,10 @@
# this repository contains the full copyright notices and license terms.
from sql import Column, Null
+from trytond.filestore import filestore
+from trytond.tools import grouped_slice, reduce_ids
+from trytond.transaction import Transaction
from .field import Field
-from ...transaction import Transaction
-from ...tools import grouped_slice, reduce_ids
-from ...filestore import filestore
class Binary(Field):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/fields/char.py
--- a/trytond/model/fields/char.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/fields/char.py Tue Jul 21 14:38:36 2020 +0200
@@ -2,9 +2,9 @@
# this repository contains the full copyright notices and license terms.
import warnings
+from trytond.rpc import RPC
from trytond.transaction import Transaction
from .field import Field, FieldTranslate, size_validate
-from ...rpc import RPC
class Char(FieldTranslate):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/fields/date.py
--- a/trytond/model/fields/date.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/fields/date.py Tue Jul 21 14:38:36 2020 +0200
@@ -4,8 +4,8 @@
from sql.functions import Function
+from trytond import backend
from trytond.pyson import PYSONEncoder
-from ... import backend
from .field import Field
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/fields/dict.py
--- a/trytond/model/fields/dict.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/fields/dict.py Tue Jul 21 14:38:36 2020 +0200
@@ -6,11 +6,11 @@
from sql import operators, Literal, Select, CombiningQuery, Cast, Null
from trytond import backend
+from trytond.pool import Pool
+from trytond.protocols.jsonrpc import JSONDecoder, JSONEncoder
+from trytond.tools import grouped_slice
from trytond.transaction import Transaction
from .field import Field, SQL_OPERATORS
-from ...protocols.jsonrpc import JSONDecoder, JSONEncoder
-from ...pool import Pool
-from ...tools import grouped_slice
# Use canonical form
dumps = partial(
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/fields/field.py
--- a/trytond/model/fields/field.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/fields/field.py Tue Jul 21 14:38:36 2020 +0200
@@ -8,14 +8,13 @@
from sql.conditionals import Coalesce, NullIf
from sql.operators import Concat
+from trytond.cache import LRUDictTransaction
+from trytond.const import OPERATORS
+from trytond.pool import Pool
from trytond.pyson import PYSON, PYSONEncoder, PYSONDecoder, Eval
-from trytond.const import OPERATORS
+from trytond.rpc import RPC
from trytond.tools.string_ import StringPartitioned, LazyString
from trytond.transaction import Transaction
-from trytond.pool import Pool
-from trytond.cache import LRUDictTransaction
-
-from ...rpc import RPC
def domain_validate(value):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/fields/float.py
--- a/trytond/model/fields/float.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/fields/float.py Tue Jul 21 14:38:36 2020 +0200
@@ -1,8 +1,7 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from trytond.pyson import PYSONEncoder
+from trytond.pyson import PYSONEncoder, PYSON
from .field import Field
-from ...pyson import PYSON
def digits_validate(value):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/fields/many2many.py
--- a/trytond/model/fields/many2many.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/fields/many2many.py Tue Jul 21 14:38:36 2020 +0200
@@ -7,12 +7,12 @@
from sql.functions import Substring, Position
from sql.conditionals import Coalesce
+from trytond.pool import Pool
from trytond.pyson import PYSONEncoder
+from trytond.tools import grouped_slice
+from trytond.transaction import Transaction
from .field import (Field, size_validate, instanciate_values, domain_validate,
search_order_validate, context_validate, instantiate_context)
-from ...pool import Pool
-from ...tools import grouped_slice
-from ...transaction import Transaction
class Many2Many(Field):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/fields/many2one.py
--- a/trytond/model/fields/many2one.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/fields/many2one.py Tue Jul 21 14:38:36 2020 +0200
@@ -5,12 +5,12 @@
from sql.conditionals import Coalesce
from sql.operators import Or
+from trytond.pool import Pool
from trytond.pyson import PYSONEncoder
+from trytond.tools import reduce_ids
+from trytond.transaction import Transaction
from .field import (Field, search_order_validate, context_validate,
with_inactive_records, instantiate_context)
-from ...pool import Pool
-from ...tools import reduce_ids
-from ...transaction import Transaction
class Many2One(Field):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/fields/numeric.py
--- a/trytond/model/fields/numeric.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/fields/numeric.py Tue Jul 21 14:38:36 2020 +0200
@@ -3,7 +3,7 @@
from decimal import Decimal
from sql import Cast, Literal, Select, CombiningQuery, As
-from ... import backend
+from trytond import backend
from .float import Float
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/fields/one2many.py
--- a/trytond/model/fields/one2many.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/fields/one2many.py Tue Jul 21 14:38:36 2020 +0200
@@ -6,12 +6,12 @@
from sql.functions import Substring, Position
from sql.conditionals import Coalesce
+from trytond.pool import Pool
from trytond.pyson import PYSONEncoder
+from trytond.tools import grouped_slice
+from trytond.transaction import Transaction
from .field import (Field, size_validate, instanciate_values, domain_validate,
search_order_validate, context_validate, instantiate_context)
-from ...pool import Pool
-from ...tools import grouped_slice
-from ...transaction import Transaction
class One2Many(Field):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/fields/reference.py
--- a/trytond/model/fields/reference.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/fields/reference.py Tue Jul 21 14:38:36 2020 +0200
@@ -5,13 +5,13 @@
from sql import Cast, Literal, Query, Expression
from sql.functions import Substring, Position
+from trytond.pool import Pool
from trytond.pyson import PYSONEncoder
+from trytond.rpc import RPC
+from trytond.transaction import Transaction
+from .selection import SelectionMixin
from .field import (Field, search_order_validate, context_validate,
with_inactive_records, instantiate_context)
-from .selection import SelectionMixin
-from ...transaction import Transaction
-from ...pool import Pool
-from ...rpc import RPC
class Reference(SelectionMixin, Field):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/fields/selection.py
--- a/trytond/model/fields/selection.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/fields/selection.py Tue Jul 21 14:38:36 2020 +0200
@@ -5,11 +5,11 @@
from sql.conditionals import Case
from trytond.pool import Pool
-from ...transaction import Transaction
-from ...tools import is_instance_method
+from trytond.rpc import RPC
+from trytond.tools import is_instance_method
from trytond.tools.string_ import LazyString
+from trytond.transaction import Transaction
from .field import Field
-from ...rpc import RPC
class SelectionMixin(Field):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/model/multivalue.py
--- a/trytond/model/multivalue.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/model/multivalue.py Tue Jul 21 14:38:36 2020 +0200
@@ -1,6 +1,6 @@
# This file is part of Tryton. The COPYRIGHT file at the toplevel of this
# repository contains the full copyright notices and license terms.
-from ..pool import Pool
+from trytond.pool import Pool
from .model import Model
from .match import MatchMixin
diff -r 360951b6b5cd -r e71e01ffc949 trytond/res/__init__.py
--- a/trytond/res/__init__.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/res/__init__.py Tue Jul 21 14:38:36 2020 +0200
@@ -1,6 +1,6 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from ..pool import Pool
+from trytond.pool import Pool
from . import group
from . import user
diff -r 360951b6b5cd -r e71e01ffc949 trytond/res/group.py
--- a/trytond/res/group.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/res/group.py Tue Jul 21 14:38:36 2020 +0200
@@ -1,9 +1,9 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
from itertools import chain
-from ..model import ModelView, ModelSQL, DeactivableMixin, fields, Unique
-from ..pool import Pool
-from ..tools import grouped_slice
+from trytond.model import ModelView, ModelSQL, DeactivableMixin, fields, Unique
+from trytond.pool import Pool
+from trytond.tools import grouped_slice
class MenuMany2Many(fields.Many2Many):
diff -r 360951b6b5cd -r e71e01ffc949 trytond/res/ir.py
--- a/trytond/res/ir.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/res/ir.py Tue Jul 21 14:38:36 2020 +0200
@@ -1,7 +1,7 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from ..model import ModelSQL, DeactivableMixin, fields
-from ..pool import Pool, PoolMeta
+from trytond.model import ModelSQL, DeactivableMixin, fields
+from trytond.pool import Pool, PoolMeta
from trytond.pyson import Eval
diff -r 360951b6b5cd -r e71e01ffc949 trytond/res/user.py
--- a/trytond/res/user.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/res/user.py Tue Jul 21 14:38:36 2020 +0200
@@ -37,28 +37,23 @@
except ImportError:
bcrypt = None
+from trytond.cache import Cache
+from trytond.config import config
+from trytond.exceptions import LoginException, RateLimitException
from trytond.exceptions import UserError
from trytond.i18n import gettext
-from ..model import (
+from trytond.model import (
ModelView, ModelSQL, Workflow, DeactivableMixin, fields, Unique)
-from ..wizard import Wizard, StateView, Button, StateTransition
-from ..tools import grouped_slice
-from ..transaction import Transaction
-from ..cache import Cache
-from ..pool import Pool
-from ..config import config
-from ..pyson import PYSONEncoder, Eval, Bool
-from ..rpc import RPC
-from ..exceptions import LoginException, RateLimitException
+from trytond.pool import Pool
+from trytond.pyson import PYSONEncoder, Eval, Bool
from trytond.report import Report, get_email
+from trytond.rpc import RPC
from trytond.sendmail import sendmail_transactional
+from trytond.tools import grouped_slice
+from trytond.transaction import Transaction
from trytond.url import host, http_host
+from trytond.wizard import Wizard, StateView, Button, StateTransition
-__all__ = [
- 'User', 'LoginAttempt', 'UserAction', 'UserGroup', 'Warning_',
- 'UserApplication', 'EmailResetPassword',
- 'UserConfigStart', 'UserConfig',
- ]
logger = logging.getLogger(__name__)
_has_password = 'password' in re.split('[,+]', config.get(
'session', 'authentications', default='password'))
diff -r 360951b6b5cd -r e71e01ffc949 trytond/sendmail.py
--- a/trytond/sendmail.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/sendmail.py Tue Jul 21 14:38:36 2020 +0200
@@ -7,8 +7,8 @@
from email.mime.text import MIMEText
from urllib.parse import parse_qs, unquote_plus
-from .config import config, parse_uri
-from .transaction import Transaction
+from trytond.config import config, parse_uri
+from trytond.transaction import Transaction
__all__ = ['sendmail_transactional', 'sendmail', 'SMTPDataManager']
logger = logging.getLogger(__name__)
diff -r 360951b6b5cd -r e71e01ffc949 trytond/tools/misc.py
--- a/trytond/tools/misc.py Tue Jul 21 14:37:01 2020 +0200
+++ b/trytond/tools/misc.py Tue Jul 21 14:38:36 2020 +0200
@@ -84,7 +84,7 @@
:return: A SMTP instance. The quit() method must be call when all
the calls to sendmail() have been made.
"""
- from ..sendmail import get_smtp_server
+ from trytond.sendmail import get_smtp_server
warnings.warn(
'get_smtp_server is deprecated use trytond.sendmail',
DeprecationWarning)
