diff --git a/__unported__/base_address_category/__init__.py b/__unported__/base_address_category/__init__.py
index 6b065bf74..dcfb1af44 100644
--- a/__unported__/base_address_category/__init__.py
+++ b/__unported__/base_address_category/__init__.py
@@ -20,4 +20,4 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import base_address
+from . import base_address
diff --git a/__unported__/base_address_category/base_address.py b/__unported__/base_address_category/base_address.py
index 0a5c9b457..0d55554e0 100644
--- a/__unported__/base_address_category/base_address.py
+++ b/__unported__/base_address_category/base_address.py
@@ -27,6 +27,7 @@ from openerp.osv import fields, orm
 
 
 class ResPartnerAdressCategory(orm.Model):
+
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
diff --git a/__unported__/partner_address_ldap/address.py b/__unported__/partner_address_ldap/address.py
index 0e058f175..2b9ac5eb1 100644
--- a/__unported__/partner_address_ldap/address.py
+++ b/__unported__/partner_address_ldap/address.py
@@ -174,7 +174,7 @@ class LDAPAddress(orm.Model):
     #         res = [x[0] for x in res]
     #     else:
     #         res = []
-    #     # search in partner name to know if we are searching partner...
+    # search in partner name to know if we are searching partner...
     #     partner_obj=self.pool.get('res.partner')
     #     part_len = len(res)-limit
     #     if part_len > 0:
@@ -184,7 +184,7 @@ class LDAPAddress(orm.Model):
     #         )
     #         for p in partner_res:
     #             addresses = partner_obj.browse(cursor, user, p).address
-    #             # Take each contact and add it to
+    # Take each contact and add it to
     #             for add in addresses:
     #                 res.append(add.id)
     #     return self.name_get(cursor, user, res, context)
@@ -255,7 +255,6 @@ class LDAPAddress(orm.Model):
             except UnicodeError:
                 logger.notifyChannel('LDAP encode', netsvc.LOG_DEBUG,
                                      'cannot unicode ' + vals[val])
-                pass
 
         if ids is not None:
             if isinstance(ids, (int, long)):
diff --git a/base_partner_merge/validate_email.py b/base_partner_merge/validate_email.py
index bb10b54b6..11afa53b8 100644
--- a/base_partner_merge/validate_email.py
+++ b/base_partner_merge/validate_email.py
@@ -68,7 +68,6 @@ VALID_ADDRESS_REGEXP = '^' + ADDR_SPEC + '$'
 
 
 def validate_email(email, check_mx=False, verify=False):
-
     """Indicate whether the given string is a valid email address
     according to the 'addr-spec' portion of RFC 2822 (see section
     3.4.1).  Parts of the spec that are marked obsolete are *not*
diff --git a/firstname_display_name_trigger/__init__.py b/firstname_display_name_trigger/__init__.py
index 5b3e10610..7476c55b3 100644
--- a/firstname_display_name_trigger/__init__.py
+++ b/firstname_display_name_trigger/__init__.py
@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import res_partner
+from . import res_partner
diff --git a/firstname_display_name_trigger/tests/__init__.py b/firstname_display_name_trigger/tests/__init__.py
index dbf93bd18..f57dc9068 100644
--- a/firstname_display_name_trigger/tests/__init__.py
+++ b/firstname_display_name_trigger/tests/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import test_display_name
+from . import test_display_name
 
 checks = [
     test_display_name
diff --git a/partner_auto_salesman/__init__.py b/partner_auto_salesman/__init__.py
index baddfb7e4..2db3e2a08 100644
--- a/partner_auto_salesman/__init__.py
+++ b/partner_auto_salesman/__init__.py
@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import res_partner
+from . import res_partner
diff --git a/partner_firstname/tests/__init__.py b/partner_firstname/tests/__init__.py
index c0902dd38..5c1049505 100644
--- a/partner_firstname/tests/__init__.py
+++ b/partner_firstname/tests/__init__.py
@@ -28,7 +28,7 @@
 #
 ##############################################################################
 
-import test_partner_firstname
+from . import test_partner_firstname
 
 checks = [
     test_partner_firstname
diff --git a/res_partner_affiliate/__init__.py b/res_partner_affiliate/__init__.py
index 998876a61..3cd8dd337 100644
--- a/res_partner_affiliate/__init__.py
+++ b/res_partner_affiliate/__init__.py
@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import res_partner
+from . import res_partner