Test and flake8 fixes

openerp_proxy/connection/__init__.py

@@ -1,5 +1,5 @@
-from odoo_rpc_client.connection import (xmlrpc,   # noqa
-                                        jsonrpc,
+from odoo_rpc_client.connection import (xmlrpc,      # noqa
+                                        jsonrpc,     # noqa
                                         connection)  # noqa
 from odoo_rpc_client.connection.connection import (ConnectorBase,        # noqa
                                                    get_connector,        # noqa

openerp_proxy/core.py

@@ -56,4 +56,4 @@
     ... 'assigned'
 """
 
-from odoo_rpc_client.client import Client
+from odoo_rpc_client.client import Client  # noqa

openerp_proxy/exceptions.py

@@ -1,6 +1,6 @@
-from odoo_rpc_client.exceptions import (Error,
-                                        ConnectorError,
-                                        ClientException,
-                                        ReportError,
-                                        LoginException,
-                                        ObjectException)
+from odoo_rpc_client.exceptions import (Error,            # noqa
+                                        ConnectorError,   # noqa
+                                        ClientException,  # noqa
+                                        ReportError,      # noqa
+                                        LoginException,   # noqa
+                                        ObjectException)  # noqa

openerp_proxy/orm/cache.py

@@ -1,3 +1,3 @@
-from odoo_rpc_client.orm.cache import (empty_cache,
-                                       Cache,
-                                       ObjectCache)
+from odoo_rpc_client.orm.cache import (empty_cache,   # noqa
+                                       Cache,         # noqa
+                                       ObjectCache)   # noqa

openerp_proxy/orm/object.py

@@ -1 +1,2 @@
-from odoo_rpc_client.orm.object import (Object, get_object)
+from odoo_rpc_client.orm.object import (Object,      # noqa
+                                        get_object)  # noqa

openerp_proxy/orm/record.py

@@ -1,11 +1,11 @@
 """ This module contains classes and logic to handle operations on records
 """
-from odoo_rpc_client.orm.record import (Record,
-                                        RecordList,
-                                        ObjectRecords,
-                                        get_record,
-                                        get_record_list)
+from odoo_rpc_client.orm.record import (Record,           # noqa
+                                        RecordList,       # noqa
+                                        ObjectRecords,    # noqa
+                                        get_record,       # noqa
+                                        get_record_list)  # noqa
 
 
 # For backward compatability
-RecordRelations = Record
+RecordRelations = Record       # noqa

openerp_proxy/orm/service.py

@@ -1 +1 @@
-from odoo_rpc_client.orm.service import Service
+from odoo_rpc_client.orm.service import Service  # noqa

openerp_proxy/plugin.py

@@ -1,2 +1,2 @@
-from odoo_rpc_client.plugin import (Plugin,
-                                    PluginManager)
+from odoo_rpc_client.plugin import (Plugin,           # noqa
+                                    PluginManager)    # noqa

openerp_proxy/plugins/external_ids.py

@@ -1,4 +1,4 @@
 """
 """
-from odoo_rpc_client.plugins.external_ids import (ExternalIDS,
-                                                  Record__XMLIDS)
+from odoo_rpc_client.plugins.external_ids import (ExternalIDS,     # noqa
+                                                  Record__XMLIDS)  # noqa

openerp_proxy/plugins/module_utils.py

@@ -1,2 +1,2 @@
-from odoo_rpc_client.plugins.module_utils import (ModuleObject,
-                                                  ModuleUtils)
+from odoo_rpc_client.plugins.module_utils import (ModuleObject,   # noqa
+                                                  ModuleUtils)    # noqa

openerp_proxy/service/db.py

@@ -1 +1,2 @@
-from odoo_rpc_client.service.db import DBService
+from odoo_rpc_client.service.db import (DBService,  # noqa
+                                        to_dbname)  # noqa

openerp_proxy/service/object.py

@@ -1 +1 @@
-from odoo_rpc_client.service.object import ObjectService
+from odoo_rpc_client.service.object import ObjectService  # noqa

openerp_proxy/service/report.py

@@ -19,7 +19,7 @@
 just use *report.save(path)* method)
 """
 
-from odoo_rpc_client.service.report import (ReportError,
-                                            ReportResult,
-                                            Report,
-                                            ReportService)
+from odoo_rpc_client.service.report import (ReportError,    # noqa
+                                            ReportResult,   # noqa
+                                            Report,         # noqa
+                                            ReportService)  # noqa

openerp_proxy/service/service.py

@@ -1,3 +1,3 @@
-from odoo_rpc_client.service.service import (get_service_class,
-                                             ServiceBase,
-                                             ServiceManager)
+from odoo_rpc_client.service.service import (get_service_class,  # noqa
+                                             ServiceBase,        # noqa
+                                             ServiceManager)     # noqa

openerp_proxy/tests/test_client.py

@@ -113,18 +113,18 @@ def test_160_plugins(self):
         # Check plugin representation
         self.assertEqual(
             str(self.client.plugins),
-            "openerp_proxy.plugin.PluginManager [%d]" % len(
+            "odoo_rpc_client.plugin.PluginManager [%d]" % len(
                 self.client.plugins))
         self.assertEqual(
             repr(self.client.plugins),
-            "<openerp_proxy.plugin.PluginManager [%d]>" % len(
+            "<odoo_rpc_client.plugin.PluginManager [%d]>" % len(
                 self.client.plugins))
         self.assertEqual(
             str(self.client.plugins.Test),
-            "openerp_proxy.plugin.Plugin:Test")
+            "odoo_rpc_client.plugin.Plugin:Test")
         self.assertEqual(
             repr(self.client.plugins.Test),
-            "<openerp_proxy.plugin.Plugin:Test>")
+            "<odoo_rpc_client.plugin.Plugin:Test>")
 
     def test_162_plugins_wrong_name(self):
         self.assertNotIn(

openerp_proxy/tests/test_connection.py

@@ -97,8 +97,11 @@ def test_05_reconnect(self):
         self.assertEqual(old_uid, cl.uid)
 
     def test_06_get_connector_names(self):
-        self.assertItemsEqual(get_connector_names(),
-                              ['json-rpc', 'json-rpcs', 'xml-rpc', 'xml-rpcs'])
+        names = get_connector_names()
+        self.assertIn('json-rpc', names)
+        self.assertIn('json-rpcs', names)
+        self.assertIn('xml-rpc', names)
+        self.assertIn('xml-rpcs', names)
 
     def test_10_call_unexistint_method(self):
         cl = self.client.login(self.env.dbname,

openerp_proxy/utils.py

@@ -1,17 +1,15 @@
 # -*- encoding: utf-8 -*-
 import os
-import six
 import json
-import functools
 
-from odoo_rpc_client.utils import (normalizeSField,
-                                   wpartial,
-                                   preprocess_args,
-                                   stdcall,
-                                   UConverter,
-                                   ustr,
-                                   DirMixIn,
-                                   AttrDict)
+from odoo_rpc_client.utils import (normalizeSField,  # noqa
+                                   wpartial,         # noqa
+                                   preprocess_args,  # noqa
+                                   stdcall,          # noqa
+                                   UConverter,       # noqa
+                                   ustr,             # noqa
+                                   DirMixIn,         # noqa
+                                   AttrDict)         # noqa
 
 __all__ = ('ustr',
            'AttrDict',