diff --git a/trytond/convert.py b/trytond/convert.py index 4841ef1c50..2306e77690 100644 --- a/trytond/convert.py +++ b/trytond/convert.py @@ -9,10 +9,10 @@ import re 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 --git a/trytond/ir/__init__.py b/trytond/ir/__init__.py index 33dcc0ab35..cb003cb51d 100644 --- a/trytond/ir/__init__.py +++ b/trytond/ir/__init__.py @@ -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 --git a/trytond/ir/action.py b/trytond/ir/action.py index 96e8252dc0..cb5aef9075 100644 --- a/trytond/ir/action.py +++ b/trytond/ir/action.py @@ -7,25 +7,19 @@ from functools import partial 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 --git a/trytond/ir/attachment.py b/trytond/ir/attachment.py index f0b6ca499b..7a25c64e9f 100644 --- a/trytond/ir/attachment.py +++ b/trytond/ir/attachment.py @@ -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 --git a/trytond/ir/cache.py b/trytond/ir/cache.py index b38a6b7bf5..d980355452 100644 --- a/trytond/ir/cache.py +++ b/trytond/ir/cache.py @@ -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 --git a/trytond/ir/calendar_.py b/trytond/ir/calendar_.py index a4153f9662..08f3cc876f 100644 --- a/trytond/ir/calendar_.py +++ b/trytond/ir/calendar_.py @@ -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 --git a/trytond/ir/configuration.py b/trytond/ir/configuration.py index 5e580725dd..2dd408e93f 100644 --- a/trytond/ir/configuration.py +++ b/trytond/ir/configuration.py @@ -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 --git a/trytond/ir/cron.py b/trytond/ir/cron.py index b4cc48d3ac..c088de311a 100644 --- a/trytond/ir/cron.py +++ b/trytond/ir/cron.py @@ -5,12 +5,13 @@ import time 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 --git a/trytond/ir/date.py b/trytond/ir/date.py index 41624ce3a7..e1fb0a4197 100644 --- a/trytond/ir/date.py +++ b/trytond/ir/date.py @@ -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 --git a/trytond/ir/export.py b/trytond/ir/export.py index f3c17851fc..55c0cd849b 100644 --- a/trytond/ir/export.py +++ b/trytond/ir/export.py @@ -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 --git a/trytond/ir/lang.py b/trytond/ir/lang.py index a9af110662..a097e9622d 100644 --- a/trytond/ir/lang.py +++ b/trytond/ir/lang.py @@ -7,15 +7,15 @@ from ast import literal_eval 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 --git a/trytond/ir/message.py b/trytond/ir/message.py index 4b69f46d4b..9aaa38516c 100644 --- a/trytond/ir/message.py +++ b/trytond/ir/message.py @@ -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 --git a/trytond/ir/model.py b/trytond/ir/model.py index b4fa7a977a..a4ec56c5c2 100644 --- a/trytond/ir/model.py +++ b/trytond/ir/model.py @@ -11,27 +11,22 @@ from sql.conditionals import Case 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 --git a/trytond/ir/module.py b/trytond/ir/module.py index e3a945a9c5..221326d5c0 100644 --- a/trytond/ir/module.py +++ b/trytond/ir/module.py @@ -18,14 +18,6 @@ from trytond.transaction import Transaction 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 --git a/trytond/ir/note.py b/trytond/ir/note.py index 6ac2838191..bbc85ad1b4 100644 --- a/trytond/ir/note.py +++ b/trytond/ir/note.py @@ -6,11 +6,11 @@ from sql import Null 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 --git a/trytond/ir/resource.py b/trytond/ir/resource.py index c903dad04c..a327243af3 100644 --- a/trytond/ir/resource.py +++ b/trytond/ir/resource.py @@ -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 --git a/trytond/ir/rule.py b/trytond/ir/rule.py index c830c5e745..1d6a4e2029 100644 --- a/trytond/ir/rule.py +++ b/trytond/ir/rule.py @@ -4,17 +4,13 @@ from collections import defaultdict 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 --git a/trytond/ir/sequence.py b/trytond/ir/sequence.py index 3e343fa712..1effc28199 100644 --- a/trytond/ir/sequence.py +++ b/trytond/ir/sequence.py @@ -5,18 +5,14 @@ import time 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 --git a/trytond/ir/session.py b/trytond/ir/session.py index a79509d936..d2acd1ebbd 100644 --- a/trytond/ir/session.py +++ b/trytond/ir/session.py @@ -15,10 +15,6 @@ except ImportError: from trytond.model import ModelSQL, fields from trytond.config import config -__all__ = [ - 'Session', 'SessionWizard', - ] - class Session(ModelSQL): "Session" diff --git a/trytond/ir/translation.py b/trytond/ir/translation.py index 562b0e1bfc..c9ae022848 100644 --- a/trytond/ir/translation.py +++ b/trytond/ir/translation.py @@ -17,28 +17,20 @@ from genshi.filters.i18n import extract as genshi_extract 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 --git a/trytond/ir/trigger.py b/trytond/ir/trigger.py index 794a8f7404..021574ab41 100644 --- a/trytond/ir/trigger.py +++ b/trytond/ir/trigger.py @@ -7,20 +7,16 @@ from sql.aggregate import Count, Max 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 --git a/trytond/ir/ui/icon.py b/trytond/ir/ui/icon.py index ec39237cf4..19b8efcf02 100644 --- a/trytond/ir/ui/icon.py +++ b/trytond/ir/ui/icon.py @@ -8,10 +8,6 @@ from trytond.tools import file_open from trytond.transaction import Transaction from trytond.rpc import RPC -__all__ = [ - 'Icon', - ] - class Icon(sequence_ordered(), ModelSQL, ModelView): 'Icon' diff --git a/trytond/ir/ui/menu.py b/trytond/ir/ui/menu.py index 53be683f36..1dd1d98b8b 100644 --- a/trytond/ir/ui/menu.py +++ b/trytond/ir/ui/menu.py @@ -9,10 +9,6 @@ from trytond.tools import grouped_slice 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 --git a/trytond/ir/ui/view.py b/trytond/ir/ui/view.py index 437095a7ce..9d1e1448c6 100644 --- a/trytond/ir/ui/view.py +++ b/trytond/ir/ui/view.py @@ -17,11 +17,6 @@ from trytond.pool import Pool from trytond.cache import Cache from trytond.rpc import RPC -__all__ = [ - 'View', 'ShowViewStart', 'ShowView', - 'ViewTreeWidth', 'ViewTreeState', 'ViewSearch', - ] - logger = logging.getLogger(__name__) diff --git a/trytond/model/fields/binary.py b/trytond/model/fields/binary.py index f6db1c89bc..4fb353b135 100644 --- a/trytond/model/fields/binary.py +++ b/trytond/model/fields/binary.py @@ -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 --git a/trytond/model/fields/char.py b/trytond/model/fields/char.py index fedf452a3f..a309c4fb2a 100644 --- a/trytond/model/fields/char.py +++ b/trytond/model/fields/char.py @@ -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 --git a/trytond/model/fields/date.py b/trytond/model/fields/date.py index 54597f88b7..9f8e288fcd 100644 --- a/trytond/model/fields/date.py +++ b/trytond/model/fields/date.py @@ -4,8 +4,8 @@ import datetime from sql.functions import Function +from trytond import backend from trytond.pyson import PYSONEncoder -from ... import backend from .field import Field diff --git a/trytond/model/fields/dict.py b/trytond/model/fields/dict.py index b34c92019c..849cc9f2ff 100644 --- a/trytond/model/fields/dict.py +++ b/trytond/model/fields/dict.py @@ -6,11 +6,11 @@ import json 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 --git a/trytond/model/fields/field.py b/trytond/model/fields/field.py index 0644e7321b..aeb85ff346 100644 --- a/trytond/model/fields/field.py +++ b/trytond/model/fields/field.py @@ -8,14 +8,13 @@ from sql import (operators, Column, Literal, Select, CombiningQuery, Null, from sql.conditionals import Coalesce, NullIf from sql.operators import Concat -from trytond.pyson import PYSON, PYSONEncoder, PYSONDecoder, Eval +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.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 --git a/trytond/model/fields/float.py b/trytond/model/fields/float.py index 30fff4dc41..0534dd125f 100644 --- a/trytond/model/fields/float.py +++ b/trytond/model/fields/float.py @@ -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 --git a/trytond/model/fields/many2many.py b/trytond/model/fields/many2many.py index 48351be36f..a16008eb58 100644 --- a/trytond/model/fields/many2many.py +++ b/trytond/model/fields/many2many.py @@ -7,12 +7,12 @@ from sql import Cast, Literal, Null 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 --git a/trytond/model/fields/many2one.py b/trytond/model/fields/many2one.py index 623442693d..628c0be969 100644 --- a/trytond/model/fields/many2one.py +++ b/trytond/model/fields/many2one.py @@ -5,12 +5,12 @@ from sql.aggregate import Max 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 --git a/trytond/model/fields/numeric.py b/trytond/model/fields/numeric.py index d7d17b6fe2..536c2d800a 100644 --- a/trytond/model/fields/numeric.py +++ b/trytond/model/fields/numeric.py @@ -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 --git a/trytond/model/fields/one2many.py b/trytond/model/fields/one2many.py index 14145e1d5c..286ad164d8 100644 --- a/trytond/model/fields/one2many.py +++ b/trytond/model/fields/one2many.py @@ -6,12 +6,12 @@ from sql import Cast, Literal 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 --git a/trytond/model/fields/reference.py b/trytond/model/fields/reference.py index 78f2006807..fec7bdc2ce 100644 --- a/trytond/model/fields/reference.py +++ b/trytond/model/fields/reference.py @@ -5,13 +5,13 @@ import warnings 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 --git a/trytond/model/fields/selection.py b/trytond/model/fields/selection.py index 8ac21b6161..c6d5c63141 100644 --- a/trytond/model/fields/selection.py +++ b/trytond/model/fields/selection.py @@ -5,11 +5,11 @@ import warnings 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 --git a/trytond/model/multivalue.py b/trytond/model/multivalue.py index 5cf45d4a61..af8f55119a 100644 --- a/trytond/model/multivalue.py +++ b/trytond/model/multivalue.py @@ -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 --git a/trytond/res/__init__.py b/trytond/res/__init__.py index dc75b653e0..cb4fd486aa 100644 --- a/trytond/res/__init__.py +++ b/trytond/res/__init__.py @@ -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 --git a/trytond/res/group.py b/trytond/res/group.py index 863a9d64ed..b8e16877b7 100644 --- a/trytond/res/group.py +++ b/trytond/res/group.py @@ -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 --git a/trytond/res/ir.py b/trytond/res/ir.py index 381d35bc65..1ac53279b0 100644 --- a/trytond/res/ir.py +++ b/trytond/res/ir.py @@ -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 --git a/trytond/res/user.py b/trytond/res/user.py index b11fa5464b..82d04c4eb1 100644 --- a/trytond/res/user.py +++ b/trytond/res/user.py @@ -37,28 +37,23 @@ try: 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 --git a/trytond/sendmail.py b/trytond/sendmail.py index 3454556936..586c0417c8 100644 --- a/trytond/sendmail.py +++ b/trytond/sendmail.py @@ -7,8 +7,8 @@ from email.utils import formatdate 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 --git a/trytond/tools/misc.py b/trytond/tools/misc.py index a5c4b00620..cb29c72984 100644 --- a/trytond/tools/misc.py +++ b/trytond/tools/misc.py @@ -84,7 +84,7 @@ def get_smtp_server(): :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)