From 5ad27258fdc98da39a8ac9ca614bdaf6a896acea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 5 Oct 2013 18:18:42 +0200 Subject: [PATCH] Fix flake8 --- trytond/__init__.py | 2 ++ trytond/backend/mysql/database.py | 3 +++ trytond/ir/translation.py | 5 ++--- trytond/model/modelstorage.py | 8 ++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/trytond/__init__.py b/trytond/__init__.py index f9921ca794..6fb585c16a 100644 --- a/trytond/__init__.py +++ b/trytond/__init__.py @@ -1,3 +1,5 @@ #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 . import server + +__all__ = ['server'] diff --git a/trytond/backend/mysql/database.py b/trytond/backend/mysql/database.py index 792998cefd..1be7c0b96d 100644 --- a/trytond/backend/mysql/database.py +++ b/trytond/backend/mysql/database.py @@ -13,6 +13,9 @@ import tempfile from sql import Flavor, Expression from sql.functions import Extract, Overlay, CharLength +__all__ = ['Database', 'DatabaseIntegrityError', 'DatabaseOperationalError', + 'Cursor'] + class MySQLExtract(Extract): diff --git a/trytond/ir/translation.py b/trytond/ir/translation.py index 8d4fdbdf8c..9e664ade08 100644 --- a/trytond/ir/translation.py +++ b/trytond/ir/translation.py @@ -14,7 +14,6 @@ try: from hashlib import md5 except ImportError: from md5 import md5 -from functools import reduce from lxml import etree from itertools import izip from sql import Column @@ -90,9 +89,9 @@ class Translation(ModelSQL, ModelView): 'Translation must be unique'), ] cls._error_messages.update({ - 'translation_overridden': \ + 'translation_overridden': ( "You can not export translation %(name)s because it is an " - "overridden translation by module %(overriding_module)s", + "overridden translation by module %(overriding_module)s"), }) @classmethod diff --git a/trytond/model/modelstorage.py b/trytond/model/modelstorage.py index 56440b7454..c34f501a65 100644 --- a/trytond/model/modelstorage.py +++ b/trytond/model/modelstorage.py @@ -743,9 +743,9 @@ class ModelStorage(Model): ModelData = pool.get('ir.model.data') # logger for collecting warnings for the client - warnings = logging.Logger("import") + logger = logging.Logger("import") warning_stream = StringIO.StringIO() - warnings.addHandler(logging.StreamHandler(warning_stream)) + logger.addHandler(logging.StreamHandler(warning_stream)) len_fields_names = len(fields_names) assert all(len(x) == len_fields_names for x in data) @@ -893,7 +893,8 @@ class ModelStorage(Model): else: return all(method(r) for r in records) for field in cls._constraints: - warnings.warn('_constraints is deprecated, override validate instead', + warnings.warn( + '_constraints is deprecated, override validate instead', DeprecationWarning, stacklevel=2) if not call(field[0]): cls.raise_user_error(field[1]) @@ -1135,7 +1136,6 @@ class ModelStorage(Model): cls.validate(records) - @classmethod def _clean_defaults(cls, defaults): pool = Pool()