Fix pep8

portal_partner_merge/__openerp__.py

@@ -18,16 +18,16 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{'name' : 'Portal Partner Merge',
- 'version' : '1.0',
+{'name': 'Portal Partner Merge',
+ 'version': '1.0',
  'category': 'Hidden',
  'description': """
 Link module for base_partner_merge which extract portal dependency
  """,
- 'author' : 'Camptocamp',
+ 'author': 'Camptocamp',
  'maintainer': 'Camptocamp',
  'website': 'http://www.camptocamp.com/',
- 'depends' : ['portal', 'base_partner_merge'],
+ 'depends': ['portal', 'base_partner_merge'],
  'data': [],
  'test': [],
  'installable': True,

portal_partner_merge/wizard/portal_wizard.py

@@ -19,10 +19,11 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import orm
 from openerp.tools.translate import _
 
-class wizard_user(osv.TransientModel):
+
+class wizard_user(orm.TransientModel):
     _inherit = 'portal.wizard.user'
 
     def get_error_messages(self, cr, uid, ids, context=None):
@@ -35,5 +36,3 @@ class wizard_user(osv.TransientModel):
                   "Merge wizard, available in the More menu after selecting "
                   "several contacts in the Customers list"))
         return error_msg
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: