Rationalize import path

We use absolute path when imported module is from a different context.
And we remove unnecessary __all__ definition.

issue9466
review323591002
This commit is contained in:
Cédric Krier committed 2020-07-21 14:38:36 +02:00
1 parent f913df040c
commit e11a23deb2
43 files changed
+144 -218

No files matched your search

+4 -4
View File
@@ -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__)
+1 -1
View File
@@ -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
+9 -15
View File
@@ -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(
+4 -4
View File
@@ -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']
+1 -5
View File
@@ -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):
+4 -4
View File
@@ -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):
+3 -5
View File
@@ -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):
+4 -3
View File
@@ -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__)
+2 -6
View File
@@ -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):
+1 -1
View File
@@ -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
+9 -9
View File
@@ -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')
+1 -3
View File
@@ -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"
+13 -18
View File
@@ -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__)
-8
View File
@@ -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
+5 -5
View File
@@ -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']
+4 -4
View File
@@ -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']
+5 -9
View File
@@ -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):
+6 -10
View File
@@ -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()
-4
View File
@@ -15,10 +15,6 @@ except ImportError:
from trytond.model import ModelSQL, fields
from trytond.config import config
__all__ = [
'Session', 'SessionWizard',
]
class Session(ModelSQL):
"Session"
+10 -18
View File
@@ -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'),
+8 -12
View File
@@ -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):
-4
View File
@@ -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'
-4
View File
@@ -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
-5
View File
@@ -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__)
+3 -3
View File
@@ -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):
+1 -1
View File
@@ -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):
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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(
+4 -5
View File
@@ -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):
+1 -2
View File
@@ -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):
+3 -3
View File
@@ -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):
+3 -3
View File
@@ -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):
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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):
+4 -4
View File
@@ -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):
+3 -3
View File
@@ -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):
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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):
+2 -2
View File
@@ -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
+10 -15
View File
@@ -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'))
+2 -2
View File
@@ -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__)
+1 -1
View File
@@ -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)