From 01da73caaa66d429b182cf28401174eb26e9dee1 Mon Sep 17 00:00:00 2001
From: Jonathan Nemry <jonathan.nemry@acsone.eu>
Date: Wed, 3 Dec 2014 10:01:54 +0100
Subject: [PATCH] [FIX] pylint

---
 base_field_serialized/tests/__init__.py    | 3 +--
 disable_openerp_online/__init__.py         | 2 +-
 disable_openerp_online/model/__init__.py   | 2 +-
 mass_editing/wizard/mass_editing_wizard.py | 2 +-
 users_ldap_populate/__init__.py            | 2 +-
 users_ldap_populate/model/users_ldap.py    | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/base_field_serialized/tests/__init__.py b/base_field_serialized/tests/__init__.py
index dde5974db..9c1e92485 100644
--- a/base_field_serialized/tests/__init__.py
+++ b/base_field_serialized/tests/__init__.py
@@ -18,5 +18,4 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import test_serialized
-from test_serialized import TestBaseFieldSerialized
+from . import test_serialized
diff --git a/disable_openerp_online/__init__.py b/disable_openerp_online/__init__.py
index 755cda011..991a0f0b3 100644
--- a/disable_openerp_online/__init__.py
+++ b/disable_openerp_online/__init__.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import model
+from . import model
 
 from openerp.tools.misc import upload_data_thread
 upload_data_thread.run = lambda x: None
diff --git a/disable_openerp_online/model/__init__.py b/disable_openerp_online/model/__init__.py
index a5c6ee5b0..db35c95db 100644
--- a/disable_openerp_online/model/__init__.py
+++ b/disable_openerp_online/model/__init__.py
@@ -18,4 +18,4 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import publisher_warranty_contract
+from . import publisher_warranty_contract
diff --git a/mass_editing/wizard/mass_editing_wizard.py b/mass_editing/wizard/mass_editing_wizard.py
index 4af12c34d..e593bf876 100644
--- a/mass_editing/wizard/mass_editing_wizard.py
+++ b/mass_editing/wizard/mass_editing_wizard.py
@@ -110,7 +110,7 @@ class MassEditingWizard(orm.TransientModel):
                     etree.SubElement(xml_group, 'field', {
                         'name': "selection__" + field.name,
                         'colspan': '2',
-                        'colspan': '2'})
+                        })
                     etree.SubElement(xml_group, 'field', {
                         'name': field.name, 'nolabel': '1',
                         'attrs': (
diff --git a/users_ldap_populate/__init__.py b/users_ldap_populate/__init__.py
index 16e8b082f..9186ee3ad 100644
--- a/users_ldap_populate/__init__.py
+++ b/users_ldap_populate/__init__.py
@@ -1 +1 @@
-import model
+from . import model
diff --git a/users_ldap_populate/model/users_ldap.py b/users_ldap_populate/model/users_ldap.py
index 5b5f47fbb..1bed8a83a 100644
--- a/users_ldap_populate/model/users_ldap.py
+++ b/users_ldap_populate/model/users_ldap.py
@@ -50,7 +50,7 @@ class CompanyLDAP(orm.Model):
             if not conf['create_user']:
                 continue
             attribute_match = re.search(
-                '([a-zA-Z_]+)=\%s', conf['ldap_filter'])
+                r'([a-zA-Z_]+)=\%s', conf['ldap_filter'])
             if attribute_match:
                 login_attr = attribute_match.group(1)
             else: