From ee828486b2f1359a1b2b7fc60fceecbdfd6aed37 Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Fri, 18 Jul 2014 19:12:57 -0400 Subject: [PATCH] Fix pep8 --- base_address_category/__init__.py | 4 +- base_address_category/__openerp__.py | 35 +-- base_address_category/base_address.py | 34 ++- base_partner_surname/__init__.py | 7 +- base_partner_surname/__openerp__.py | 27 +- base_partner_surname/partner.py | 23 +- partner_address_ldap/__init__.py | 2 +- partner_address_ldap/__openerp__.py | 42 +-- partner_address_ldap/address.py | 264 +++++++++--------- partner_address_ldap/company.py | 9 +- partner_address_ldap/partner.py | 11 +- partner_address_ldap/wizard/__init__.py | 4 +- .../wizard/wiz_import_adresses.py | 78 +++--- 13 files changed, 275 insertions(+), 265 deletions(-) diff --git a/base_address_category/__init__.py b/base_address_category/__init__.py index 56a751a80..d5a3f97bb 100644 --- a/base_address_category/__init__.py +++ b/base_address_category/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) +# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) # All Right Reserved # # Author : Nicolas Bessi (Camptocamp), Joel Grand-Guillaume @@ -28,4 +28,4 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # ############################################################################## -import base_address \ No newline at end of file +import base_address diff --git a/base_address_category/__openerp__.py b/base_address_category/__openerp__.py index 0041209d4..615633475 100644 --- a/base_address_category/__openerp__.py +++ b/base_address_category/__openerp__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) +# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) # All Right Reserved # # Author : Nicolas Bessi (Camptocamp), Joel Grand-Guillaume @@ -30,24 +30,25 @@ ############################################################################## { - "name" : "Partner Adress Category", - "description" : """Add categories on Address like there is on Partner. This is interesting for managing mailling list based on address - for example. + "name": "Partner Adress Category", + "description": """ +Add categories on Address like there is on Partner. +This is interesting for managing mailling list based on address for example. """, - "version" : "1.2", - "author" : "Camptocamp", - "category" : "Generic Modules/Base", + "version": "1.2", + "author": "Camptocamp", + "category": "Generic Modules/Base", "website": "http://www.camptocamp.com", - "depends" : [ - "base", - ], - "init_xml" : [ - "security/security.xml" - ], - "update_xml" : [ - "base_address_view.xml", - 'security/ir.model.access.csv', - ], + "depends": [ + "base", + ], + "init_xml": [ + "security/security.xml" + ], + "update_xml": [ + "base_address_view.xml", + 'security/ir.model.access.csv', + ], "active": False, "installable": True } diff --git a/base_address_category/base_address.py b/base_address_category/base_address.py index 513b551fb..fb996f72f 100644 --- a/base_address_category/base_address.py +++ b/base_address_category/base_address.py @@ -30,62 +30,68 @@ ############################################################################## -from osv import osv, fields +from openerp.osv import orm, fields -class ResPartnerAdressCategory(osv.osv): + +class ResPartnerAdressCategory(orm.Model): def name_get(self, cr, uid, ids, context={}): if not len(ids): return [] - reads = self.read(cr, uid, ids, ['name','parent_id'], context) + reads = self.read(cr, uid, ids, ['name', 'parent_id'], context) res = [] for record in reads: name = record['name'] if record['parent_id']: - name = record['parent_id'][1]+' / '+name + name = record['parent_id'][1] + ' / ' + name res.append((record['id'], name)) return res def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, unknow_dict): res = self.name_get(cr, uid, ids) return dict(res) + def _check_recursion(self, cr, uid, ids): level = 100 while len(ids): cr.execute('select distinct parent_id from res_partner_address_category\ - where id in ('+','.join(map(unicode,ids))+')') - ids = filter(None, map(lambda x:x[0], cr.fetchall())) + where id in ('+','.join(map(unicode, ids))+')') + ids = filter(None, map(lambda x: x[0], cr.fetchall())) if not level: return False level -= 1 return True - - - _description='Partner address Categories' + _description = 'Partner address Categories' _name = 'res.partner.address.category' _columns = { 'name': fields.char('Category Name', required=True, size=64), 'parent_id': fields.many2one('res.partner.address.category', 'Parent Category', select=True), 'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Name'), 'child_ids': fields.one2many('res.partner.address.category', 'parent_id', 'Childs Category'), - 'active' : fields.boolean('Active'), + 'active': fields.boolean('Active'), } _constraints = [ - (_check_recursion, 'Error ! You can not create recursive categories.', ['parent_id']) + (_check_recursion, 'Error! You can not create recursive categories.', ['parent_id']) ] _defaults = { - 'active' : lambda *a: 1, + 'active': lambda *a: 1, } _order = 'parent_id,name' ResPartnerAdressCategory() -class ResPartnerAddress(osv.osv): +class ResPartnerAddress(orm.Model): _inherit = "res.partner.address" _columns = { - 'category_id': fields.many2many('res.partner.address.category', 'res_partner_address_category_rel', 'adress_id', 'category_id', 'Adress categories'), + 'category_id': fields.many2many( + 'res.partner.address.category', + 'res_partner_address_category_rel', + 'adress_id', + 'category_id', + 'Adress categories', + ), } ResPartnerAddress() diff --git a/base_partner_surname/__init__.py b/base_partner_surname/__init__.py index a8fdaa846..c8e7fd8f0 100644 --- a/base_partner_surname/__init__.py +++ b/base_partner_surname/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,9 +15,8 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## -import partner -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +from . import partner diff --git a/base_partner_surname/__openerp__.py b/base_partner_surname/__openerp__.py index 20c194d09..a06a8a7d2 100755 --- a/base_partner_surname/__openerp__.py +++ b/base_partner_surname/__openerp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,26 +15,25 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## { - "name" : "Base Partner Surname", - "version" : "1.1", - "author" : "Tiny, Serpent Consulting Services", - "website" : "http://www.openerp.com", - "category" : "Generic Modules/Base", + "name": "Base Partner Surname", + "version": "1.1", + "author": "Tiny, Serpent Consulting Services", + "website": "http://www.openerp.com", + "category": "Generic Modules/Base", "description": """ -This module is used for separate surname from contact name of partner. Now You can give first name & last name on contact Name. +This module is used for separate surname from contact name of partner. Now You +can give first name & last name on contact Name. This module is deprecated, it is highly recommended to use base_contact instead. """, - "depends" : ["base"], - "init_xml" : [ ], - "demo_xml" : [ ], - "update_xml" : [ "partner_view.xml" ], + "depends": ["base"], + "init_xml": [], + "demo_xml": [], + "update_xml": ["partner_view.xml"], "installable": True, "auto_install": False } -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/base_partner_surname/partner.py b/base_partner_surname/partner.py index f63f22fa6..2d29d9803 100644 --- a/base_partner_surname/partner.py +++ b/base_partner_surname/partner.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -25,21 +25,21 @@ from openerp.osv import orm, fields class res_partner_address(orm.Model): _inherit = 'res.partner.address' _columns = { - 'first_name' : fields.char('First Name', size=128), - 'last_name' : fields.char('Last Name', size=128), - 'name' : fields.char('Name', size=128, readonly=True), + 'first_name': fields.char('First Name', size=128), + 'last_name': fields.char('Last Name', size=128), + 'name': fields.char('Name', size=128, readonly=True), } - + def write(self, cr, uid, ids, vals, context=None): if context is None: context = {} - if isinstance(ids,list): + if isinstance(ids, list): ids = ids[0] - data = self.read(cr, uid, ids, ['first_name','last_name'], context=context) + data = self.read(cr, uid, ids, ['first_name', 'last_name'], context=context) first_name = data['first_name'] or '' if 'first_name' in vals: first_name = vals['first_name'] or '' - + last_name = data['last_name'] or '' if 'last_name' in vals: last_name = vals['last_name'] or '' @@ -57,7 +57,7 @@ class res_partner_address(orm.Model): first_name = vals['first_name'] or '' if 'last_name' in vals: last_name = vals['last_name'] or '' - + if first_name or last_name: vals['name'] = first_name + ' ' + last_name return super(res_partner_address, self).create(cr, uid, vals, context=context) @@ -71,6 +71,3 @@ class res_partner_address(orm.Model): if first_name or last_name: res = {'name': first_name + ' ' + last_name} return {'value': res} - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/partner_address_ldap/__init__.py b/partner_address_ldap/__init__.py index 783946023..c2f7c76b8 100644 --- a/partner_address_ldap/__init__.py +++ b/partner_address_ldap/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) +# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) # All Right Reserved # # Author : Nicolas Bessi (Camptocamp), Thanks to Laurent Lauden for his code adaptation diff --git a/partner_address_ldap/__openerp__.py b/partner_address_ldap/__openerp__.py index 556f48f88..74ef41941 100644 --- a/partner_address_ldap/__openerp__.py +++ b/partner_address_ldap/__openerp__.py @@ -32,37 +32,43 @@ ############################################################################## { - "name" : "Partner synchronization from OpenERP to ldap", - "version" : "1.2", - "author" : "Camptocamp", - "depends" : ["base"], - "category" : "Generic Modules/Misc", + "name": "Partner synchronization from OpenERP to ldap", + "version": "1.2", + "author": "Camptocamp", + "depends": ["base"], + "category": "Generic Modules/Misc", "website": "http://www.camptocamp.com", "description": """ Live partner address synchronization through a LDAP module (inetOrgPerson). -OpenERP becomes the master of the LDAP. Each time an address is deleted, created or updated the same is done in the ldap (a new record is pushed). -The LDAP configuration is done in the company view. There can be one different LDAP per company. Do not forget to activate -the LDAP link in the configuration. +OpenERP becomes the master of the LDAP. Each time an address is deleted, +created or updated the same is done in the ldap (a new record is pushed). +The LDAP configuration is done in the company view. There can be one different +LDAP per company. Do not forget to activate the LDAP link in the configuration. The used LDAP depends on the current user company. -This module does not allows bulk batching synchronisation into the LDAP and is thus not suitable for an instant use with an existing LDAP. -In order to use it with an existing LDAP you have to alter the uid of contact in your LDAP. The uid should be terp_ plus the OpenERP +This module does not allows bulk batching synchronisation into the LDAP and is +thus not suitable for an instant use with an existing LDAP. +In order to use it with an existing LDAP you have to alter the uid of contact +in your LDAP. The uid should be terp_ plus the OpenERP contact id (for example terp_10). N.B: The module requires the python-ldap library -Unicode support --> As python ldap does not support unicode we try to decode string if it fails we transliterate values. -Active Directory Support for Windows server 2003, try 2008 at your own risk -(AD support not tested for Version 6 of OpenERP looking for active dir test infra) +Unicode support --> As python ldap does not support unicode we try to decode +string if it fails we transliterate values. +Active Directory Support for Windows server 2003, try 2008 at your own risk +(AD support not tested for Version 6 of OpenERP looking for active dir test infra) """, - "init_xml" : ["security/security.xml"], - "update_xml":['company_view.xml', - 'address_view.xml', - "wizard.xml"], - "demo_xml" : [], + "init_xml": ["security/security.xml"], + "update_xml": [ + 'company_view.xml', + 'address_view.xml', + "wizard.xml", + ], + "demo_xml": [], "active": False, "installable": True } diff --git a/partner_address_ldap/address.py b/partner_address_ldap/address.py index e9e068bdd..165075f91 100644 --- a/partner_address_ldap/address.py +++ b/partner_address_ldap/address.py @@ -30,27 +30,30 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # ############################################################################## -#TODO FInd why company parameter are cached + +# TODO Find why company parameter are cached + import re import unicodedata import netsvc try: import ldap import ldap.modlist -except : - print 'python ldap not installed please install it in order to use this module' +except ImportError: + print('python ldap not installed please install it in order to use this module') - -from osv import osv, fields +from openerp.osv import orm, fields from tools.translate import _ - logger = netsvc.Logger() + class LdapConnMApper(object): """LdapConnMApper: push specific fields from the Terp Partner_contacts to the - LDAP schema inetOrgPerson. Ldap bind options are stored in company.r""" + LDAP schema inetOrgPerson. Ldap bind options are stored in company. + """ + def __init__(self, cursor, uid, osv_obj, context=None): - """Initialize connexion to ldap by using parameter set in the current user compagny""" + """Initialize connexion to ldap by using parameter set in the current user company""" logger.notifyChannel("MY TOPIC", netsvc.LOG_DEBUG, _('Initalize LDAP CONN')) self.USER_DN = '' @@ -61,7 +64,7 @@ class LdapConnMApper(object): self.connexion = '' self.ACTIVDIR = False - #Reading ldap pref + # Reading ldap pref user = osv_obj.pool.get('res.users').browse(cursor, uid, uid, context=context) company = osv_obj.pool.get('res.company').browse(cursor, uid, @@ -75,26 +78,26 @@ class LdapConnMApper(object): self.OU = company.ounit self.ACTIVDIR = company.is_activedir - mand = (self.USER_DN, self.CONTACT_DN, self.LDAP_SERVER , self.PASS, self.OU) + mand = (self.USER_DN, self.CONTACT_DN, self.LDAP_SERVER, self.PASS, self.OU) if company.ldap_active: for param in mand: if not param: - raise osv.except_osv(_('Warning !'), + raise orm.except_orm(_('Warning !'), _('An LDAP parameter is missing for company %s') % (company.name,)) def get_connexion(self): """create a new ldap connexion""" logger.notifyChannel("LDAP Address", netsvc.LOG_DEBUG, _('connecting to server ldap %s') % (self.LDAP_SERVER,)) - if self.PORT : + if self.PORT: self.connexion = ldap.open(self.LDAP_SERVER, self.PORT) - else : + else: self.connexion = ldap.open(self.LDAP_SERVER) self.connexion.simple_bind_s(self.USER_DN, self.PASS) return self.connexion -class LDAPAddress(osv.osv): +class LDAPAddress(orm.Model): """Override the CRUD of the objet in order to dynamically bind to ldap""" _inherit = 'res.partner.address' ldapMapper = None @@ -108,7 +111,7 @@ class LDAPAddress(osv.osv): 'column name to lastname ;')) cr.execute('ALTER TABLE res_partner_address RENAME column name to lastname ;') - except Exception, e: + except Exception: cr.rollback() logger.notifyChannel(_('LDAP address init'), netsvc.LOG_INFO, @@ -119,7 +122,7 @@ class LDAPAddress(osv.osv): def _compute_name(self, firstname, lastname): firstname = firstname or u'' lastname = lastname or u'' - firstname = (u' '+ firstname).rstrip() + firstname = (u' ' + firstname).rstrip() return u"%s%s" % (lastname, firstname) def _name_get_fnc(self, cursor, uid, ids, name, arg, context=None): @@ -129,37 +132,36 @@ class LDAPAddress(osv.osv): reads = self.read(cursor, uid, ids, ['lastname', 'firstname']) res = [] for record in reads: - ## We want to have " firstname" or "" + # We want to have " firstname" or "" name = self._compute_name(record['firstname'], record['lastname']) res.append((record['id'], name)) return dict(res) -# TODO get the new version of name search not vulnerable to sql injections -# def name_search(self, cursor, user, name, args=None, operator='ilike', context=None, limit=100): -# if not context: context = {} -# prep_name = '.*%s.*' %(name) -# cursor.execute(("select id from res_partner_address where" -# " (to_ascii(convert( lastname, 'UTF8', 'LATIN1'),'LATIN-1') ~* '%s'" -# " or to_ascii(convert( firstname, 'UTF8', 'LATIN1'),'LATIN-1') ~* '%s')" -# " limit %s") % (prep_name, prep_name, limit)) -# res = cursor.fetchall() -# if res: -# res = [x[0] for x in res] -# else: -# res = [] -# # 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: -# partner_res = partner_obj.search(cursor, user, [('name', 'ilike', name)], -# limit=part_len, context=context) -# for p in partner_res: -# addresses = partner_obj.browse(cursor, user, p).address -# # Take each contact and add it to -# for add in addresses: -# res.append(add.id) -# return self.name_get(cursor, user, res, context) - + # TODO get the new version of name search not vulnerable to sql injections + # def name_search(self, cursor, user, name, args=None, operator='ilike', context=None, limit=100): + # if not context: context = {} + # prep_name = '.*%s.*' %(name) + # cursor.execute(("select id from res_partner_address where" + # " (to_ascii(convert( lastname, 'UTF8', 'LATIN1'),'LATIN-1') ~* '%s'" + # " or to_ascii(convert( firstname, 'UTF8', 'LATIN1'),'LATIN-1') ~* '%s')" + # " limit %s") % (prep_name, prep_name, limit)) + # res = cursor.fetchall() + # if res: + # res = [x[0] for x in res] + # else: + # res = [] + # # 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: + # partner_res = partner_obj.search(cursor, user, [('name', 'ilike', name)], + # limit=part_len, context=context) + # for p in partner_res: + # addresses = partner_obj.browse(cursor, user, p).address + # # Take each contact and add it to + # for add in addresses: + # res.append(add.id) + # return self.name_get(cursor, user, res, context) _columns = { 'firstname': fields.char('First name', size=256), @@ -169,10 +171,10 @@ class LDAPAddress(osv.osv): store=True, string='Contact Name', help='Name generated from the first name and last name', nodrop=True), - 'private_phone':fields.char('Private phone', size=128), + 'private_phone': fields.char('Private phone', size=128), } - def create(self, cursor, uid, vals, context={}): + def create(self, cursor, uid, vals, context=None): self.getconn(cursor, uid, {}) ids = None self.validate_entries(vals, cursor, uid, ids) @@ -189,9 +191,9 @@ class LDAPAddress(osv.osv): ids = [ids] if ids: self.validate_entries(vals, cursor, uid, ids) - if context.has_key('init_mode') and context['init_mode'] : + if context.get('init_mode'): success = True - else : + else: success = super(LDAPAddress, self).write(cursor, uid, ids, vals, context) if self.ldaplinkactive(cursor, uid, context): @@ -200,7 +202,8 @@ class LDAPAddress(osv.osv): return success def unlink(self, cursor, uid, ids, context=None): - if not context: context = {} + if context is None: + context = {} if ids: self.getconn(cursor, uid, {}) if not isinstance(ids, list): @@ -212,77 +215,75 @@ class LDAPAddress(osv.osv): def validate_entries(self, vals, cursor, uid, ids): """Validate data of an address based on the inetOrgPerson schema""" - for val in vals : - try : + for val in vals: + try: if isinstance(vals[val], basestring): vals[val] = unicode(vals[val].decode('utf8')) except UnicodeError: logger.notifyChannel('LDAP encode', netsvc.LOG_DEBUG, - 'cannot unicode '+ vals[val]) + 'cannot unicode ' + vals[val]) pass if ids is not None: if isinstance(ids, (int, long)): ids = [ids] if len(ids) == 1: - self.addNeededFields(ids[0],vals,cursor,uid) + self.addNeededFields(ids[0], vals, cursor, uid) email = vals.get('email', False) phone = vals.get('phone', False) fax = vals.get('fax', False) mobile = vals.get('mobile', False) - lastname = vals.get('lastname', False) private_phone = vals.get('private_phone', False) - if email : + if email: if re.match("^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$", email) is None: - raise osv.except_osv(_('Warning !'), + raise orm.except_orm(_('Warning !'), _('Please enter a valid e-mail')) phones = (('phone', phone), ('fax', fax), ('mobile', mobile), ('private_phone', private_phone)) for phone_tuple in phones: phone_number = phone_tuple[1] - if phone_number : + if phone_number: if not phone_number.startswith('+'): - raise osv.except_osv(_('Warning !'), + raise orm.except_orm(_('Warning !'), _('Please enter a valid phone number in %s' ' international format (i.e. leading +)') % phone_tuple[0]) def getVals(self, att_name, key, vals, dico, uid, ids, cursor, context=None): """map to values to dict""" - if not context: context = {} - ## We explicitely test False value - if vals.get(key, False) != False: + if context is None: + context = {} + # We explicitely test False value + if vals.get(key, False) is not False: dico[att_name] = vals[key] - else : + else: if context.get('init_mode'): return False tmp = self.read(cursor, uid, ids, [key], context={}) - if tmp.get(key, False) : + if tmp.get(key, False): dico[att_name] = tmp[key] - def _un_unicodize_buf(self, in_buf): - if isinstance(in_buf, unicode) : + if isinstance(in_buf, unicode): try: return in_buf.encode() - except Exception, e: - return unicodedata.normalize("NFKD", in_buf).encode('ascii','ignore') + except Exception: + return unicodedata.normalize("NFKD", in_buf).encode('ascii', 'ignore') return in_buf - def unUnicodize(self, indict) : + def unUnicodize(self, indict): """remove unicode data of modlist as unicode is not supported by python-ldap librairy till version 2.7""" - for key in indict : + for key in indict: if not isinstance(indict[key], list): indict[key] = self._un_unicodize_buf(indict[key]) else: nonutfArray = [] - for val in indict[key] : + for val in indict[key]: nonutfArray.append(self._un_unicodize_buf(val)) indict[key] = nonutfArray def addNeededFields(self, id, vals, cursor, uid): - keys = vals.keys() previousvalue = self.browse(cursor, uid, [id])[0] if not vals.get('partner_id'): vals['partner_id'] = previousvalue.partner_id.id @@ -296,140 +297,139 @@ class LDAPAddress(osv.osv): """Mapp ResPArtner adress to moddlist""" self.addNeededFields(id, vals, cursor, uid) conn = self.getconn(cursor, uid, {}) - keys = vals.keys() - partner_obj=self.pool.get('res.partner') + partner_obj = self.pool.get('res.partner') part_name = partner_obj.browse(cursor, uid, vals['partner_id']).name vals['partner'] = part_name name = self._compute_name(vals.get('firstname'), vals.get('lastname')) - if name : + if name: cn = name else: cn = part_name - if not vals.get('lastname') : + if not vals.get('lastname'): vals['lastname'] = part_name - contact_obj = {'objectclass' : ['inetOrgPerson'], + contact_obj = {'objectclass': ['inetOrgPerson'], 'uid': ['terp_'+str(id)], - 'ou':[conn.OU], - 'cn':[cn], - 'sn':[vals['lastname']]} + 'ou': [conn.OU], + 'cn': [cn], + 'sn': [vals['lastname']]} if not vals.get('street'): vals['street'] = u'' if not vals.get('street2'): vals['street2'] = u'' street_key = 'street' - if self.getconn(cursor, uid, {}).ACTIVDIR : + if self.getconn(cursor, uid, {}).ACTIVDIR: # ENTERING THE M$ Realm and it is weird # We manage the address street_key = 'streetAddress' contact_obj[street_key] = vals['street'] + "\r\n" + vals['street2'] - #we modifiy the class - contact_obj['objectclass'] = ['top','person','organizationalPerson','inetOrgPerson','user'] - #we handle the country - if vals.get('country_id') : - country = self.browse(cursor, uid, id).country_id - if country : + # we modifiy the class + contact_obj['objectclass'] = ['top', 'person', 'organizationalPerson', 'inetOrgPerson', 'user'] + # we handle the country + if vals.get('country_id'): + country = self.browse(cursor, uid, id).country_id + if country: vals['country_id'] = country.name vals['c'] = country.code - else : + else: vals['country_id'] = False vals['c'] = False - if vals.get('country_id', False) : + if vals.get('country_id', False): self.getVals('co', 'country_id', vals, contact_obj, uid, id, cursor, context) self.getVals('c', 'c', vals, contact_obj, uid, id, cursor, context) # we compute the display name - vals['display'] = '%s %s'%(vals['partner'], contact_obj['cn'][0]) + vals['display'] = '%s %s' % (vals['partner'], contact_obj['cn'][0]) # we get the title if self.browse(cursor, uid, id).function: contact_obj['description'] = self.browse(cursor, uid, id).function.name # we replace carriage return if vals.get('comment', False): - vals['comment'] = vals['comment'].replace("\n","\r\n") + vals['comment'] = vals['comment'].replace("\n", "\r\n") # Active directory specific fields - self.getVals('company', 'partner' ,vals, contact_obj, uid, id, cursor, context) - self.getVals('info', 'comment' ,vals, contact_obj, uid, id, cursor, context) - self.getVals('displayName', 'partner' ,vals, contact_obj, uid, id, cursor, context) - ## Web site management + self.getVals('company', 'partner', vals, contact_obj, uid, id, cursor, context) + self.getVals('info', 'comment', vals, contact_obj, uid, id, cursor, context) + self.getVals('displayName', 'partner', vals, contact_obj, uid, id, cursor, context) + # Web site management if self.browse(cursor, uid, id).partner_id.website: vals['website'] = self.browse(cursor, uid, id).partner_id.website self.getVals('wWWHomePage', 'website', vals, contact_obj, uid, id, cursor, context) del(vals['website']) self.getVals('title', 'title', vals, contact_obj, uid, id, cursor, context) - else : + else: contact_obj[street_key] = vals['street'] + u"\n" + vals['street2'] - self.getVals('o','partner' ,vals, contact_obj, uid, id, cursor, context) - - #Common attributes - self.getVals('givenName', 'firstname',vals, contact_obj, uid, id, cursor, context) - self.getVals('mail', 'email',vals, contact_obj, uid, id, cursor, context) - self.getVals('telephoneNumber', 'phone',vals, contact_obj, uid, id, cursor, context) - self.getVals('l', 'city',vals, contact_obj, uid, id, cursor, context) - self.getVals('facsimileTelephoneNumber', 'fax',vals, contact_obj, uid, id, cursor, context) - self.getVals('mobile', 'mobile',vals, contact_obj, uid, id, cursor, context) - self.getVals('homePhone', 'private_phone',vals, contact_obj, uid, id, cursor, context) - self.getVals('postalCode', 'zip',vals, contact_obj, uid, id, cursor, context) + self.getVals('o', 'partner', vals, contact_obj, uid, id, cursor, context) + + # Common attributes + self.getVals('givenName', 'firstname', vals, contact_obj, uid, id, cursor, context) + self.getVals('mail', 'email', vals, contact_obj, uid, id, cursor, context) + self.getVals('telephoneNumber', 'phone', vals, contact_obj, uid, id, cursor, context) + self.getVals('l', 'city', vals, contact_obj, uid, id, cursor, context) + self.getVals('facsimileTelephoneNumber', 'fax', vals, contact_obj, uid, id, cursor, context) + self.getVals('mobile', 'mobile', vals, contact_obj, uid, id, cursor, context) + self.getVals('homePhone', 'private_phone', vals, contact_obj, uid, id, cursor, context) + self.getVals('postalCode', 'zip', vals, contact_obj, uid, id, cursor, context) self.unUnicodize(contact_obj) return contact_obj def saveLdapContact(self, id, vals, cursor, uid, context=None): """save openerp adress to ldap""" - contact_obj = self.mappLdapObject(id,vals,cursor,uid,context) + contact_obj = self.mappLdapObject(id, vals, cursor, uid, context) conn = self.connectToLdap(cursor, uid, context=context) try: if self.getconn(cursor, uid, context).ACTIVDIR: - conn.connexion.add_s("CN=%s,OU=%s,%s"%(contact_obj['cn'][0], conn.OU, conn.CONTACT_DN), + conn.connexion.add_s("CN=%s,OU=%s,%s" % (contact_obj['cn'][0], conn.OU, conn.CONTACT_DN), ldap.modlist.addModlist(contact_obj)) else: - conn.connexion.add_s("uid=terp_%s,OU=%s,%s"%(str(id), conn.OU, conn.CONTACT_DN), - ldap.modlist.addModlist(contact_obj)) - except Exception, e: - raise e + conn.connexion.add_s("uid=terp_%s,OU=%s,%s" % (str(id), conn.OU, conn.CONTACT_DN), + ldap.modlist.addModlist(contact_obj)) + except Exception: + raise conn.connexion.unbind_s() def updateLdapContact(self, id, vals, cursor, uid, context): """update an existing contact with the data of OpenERP""" - conn = self.connectToLdap(cursor,uid,context={}) + conn = self.connectToLdap(cursor, uid, context={}) try: - old_contatc_obj = self.getLdapContact(conn,id) + old_contatc_obj = self.getLdapContact(conn, id) except ldap.NO_SUCH_OBJECT: - self.saveLdapContact(id,vals,cursor,uid,context) + self.saveLdapContact(id, vals, cursor, uid, context) return - contact_obj = self.mappLdapObject(id,vals,cursor,uid,context) + contact_obj = self.mappLdapObject(id, vals, cursor, uid, context) if conn.ACTIVDIR: modlist = [] - for key, val in contact_obj.items() : + for key, val in contact_obj.items(): if key in ('cn', 'uid', 'objectclass'): continue if isinstance(val, list): val = val[0] modlist.append((ldap.MOD_REPLACE, key, val)) - else : + else: modlist = ldap.modlist.modifyModlist(old_contatc_obj[1], contact_obj) try: conn.connexion.modify_s(old_contatc_obj[0], modlist) conn.connexion.unbind_s() - except Exception, e: - raise e + except Exception: + raise def removeLdapContact(self, id, cursor, uid): """Remove a contact from ldap""" - conn = self.connectToLdap(cursor,uid,context={}) + conn = self.connectToLdap(cursor, uid, context={}) to_delete = None try: - to_delete = self.getLdapContact(conn,id) + to_delete = self.getLdapContact(conn, id) except ldap.NO_SUCH_OBJECT: logger.notifyChannel("Warning", netsvc.LOG_INFO, - _("'no object to delete in ldap' %s") %(id)) - except Exception, e : - raise e + _("'no object to delete in ldap' %s") % (id)) + except Exception: + raise try: - if to_delete : + if to_delete: conn.connexion.delete_s(to_delete[0]) conn.connexion.unbind_s() - except Exception, e: - raise e + except Exception: + raise def getLdapContact(self, conn, id): - result = conn.connexion.search_ext_s("ou=%s,%s"%(conn.OU,conn.CONTACT_DN), + result = conn.connexion.search_ext_s("ou=%s,%s" % (conn.OU, conn.CONTACT_DN), ldap.SCOPE_SUBTREE, "(&(objectclass=*)(uid=terp_"+str(id)+"))") if not result: @@ -439,19 +439,19 @@ class LDAPAddress(osv.osv): def ldaplinkactive(self, cursor, uid, context=None): """Check if ldap is activated for this company""" user = self.pool.get('res.users').browse(cursor, uid, uid, context=context) - company = self.pool.get('res.company').browse(cursor, uid,user.company_id.id, context=context) + company = self.pool.get('res.company').browse(cursor, uid, user.company_id.id, context=context) return company.ldap_active def getconn(self, cursor, uid, context=None): """LdapConnMApper""" - if not self.ldapMapper : + if not self.ldapMapper: self.ldapMapper = LdapConnMApper(cursor, uid, self) return self.ldapMapper def connectToLdap(self, cursor, uid, context=None): """Reinitialize ldap connection""" - #getting ldap pref - if not self.ldapMapper : + # getting ldap pref + if not self.ldapMapper: self.getconn(cursor, uid, context) self.ldapMapper.get_connexion() return self.ldapMapper diff --git a/partner_address_ldap/company.py b/partner_address_ldap/company.py index 5fb88d17a..9b2c2331f 100644 --- a/partner_address_ldap/company.py +++ b/partner_address_ldap/company.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) +# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) # All Right Reserved # # Author : Nicolas Bessi (Camptocamp), Thanks to Laurent Lauden for his code adaptation @@ -33,6 +33,7 @@ from osv import osv, fields + class Res_company(osv.osv): """Defin ldap connexion parameters""" @@ -46,7 +47,7 @@ class Res_company(osv.osv): 'contact_dn': fields.char( 'Bind dn', size=128, - help="Exemple: dc=ldap,dc=dcc2c -- watchout" +\ + help="Exemple: dc=ldap,dc=dcc2c -- watchout" " the OU will be automatically included inside" ), 'ounit': fields.char( @@ -69,8 +70,8 @@ class Res_company(osv.osv): help='The ldap is part of an Active Directory' ), 'ldap_port': fields.integer('LDAP Port', - help="If not specified, the default port" - "(389), will be used") + help="If not specified, the default port" + "(389), will be used") } Res_company() diff --git a/partner_address_ldap/partner.py b/partner_address_ldap/partner.py index 1f93ee11d..8991cebee 100644 --- a/partner_address_ldap/partner.py +++ b/partner_address_ldap/partner.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) +# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) # All Right Reserved # # Author : Nicolas Bessi (Camptocamp), Thanks to Laurent Lauden for his code adaptation @@ -31,13 +31,14 @@ # ############################################################################## -from osv import osv, fields - -class LdapPartner(osv.osv): +from openerp.osv import orm + + +class LdapPartner(orm.Model): """Ensure that when deleting a partner unlink function is called on all related addresses""" _inherit = 'res.partner' - + def unlink(self, cursor, uid, ids, context=None): context = context or {} addr_obj = self.pool.get('res.partner.address') diff --git a/partner_address_ldap/wizard/__init__.py b/partner_address_ldap/wizard/__init__.py index d8a6f0408..ffecac956 100644 --- a/partner_address_ldap/wizard/__init__.py +++ b/partner_address_ldap/wizard/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) +# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) # All Right Reserved # # Author : Vincent Renaville @@ -29,4 +29,4 @@ # ############################################################################## -import wiz_import_adresses \ No newline at end of file +import wiz_import_adresses diff --git a/partner_address_ldap/wizard/wiz_import_adresses.py b/partner_address_ldap/wizard/wiz_import_adresses.py index cd29ed512..1629d7dff 100644 --- a/partner_address_ldap/wizard/wiz_import_adresses.py +++ b/partner_address_ldap/wizard/wiz_import_adresses.py @@ -61,19 +61,20 @@ _FIELDS = { }, } -### As this is a bulck batch wizzard the performance process was not reallay taken in account ### -##The ideal way of doing would be to modify the connexion settings in order to have a connexion singelton -## in the file partner.py it will avoid connexion renegotiation for each partner. + +# As this is a bulck batch wizard the performance process was not reallay taken in account +# The ideal way of doing would be to modify the connexion settings in order to have a connexion singelton +# in the file partner.py it will avoid connexion renegotiation for each partner. def _action_import_adresses(self, cr, uid, data, context): """ This function create or update each adresses present in the database. It will also genreate an error report""" logger = netsvc.Logger() error_report = [u'Error report'] add_obj = pooler.get_pool(cr.dbname).get('res.partner.address') - add_ids = add_obj.search(cr,uid,[]) - addresses = add_obj.browse(cr, uid, add_ids) - phone_fields = ['phone','fax','mobile','private_phone'] - for add in addresses : + add_ids = add_obj.search(cr, uid, []) + addresses = add_obj.browse(cr, uid, add_ids, context=context) + phone_fields = ['phone', 'fax', 'mobile', 'private_phone'] + for add in addresses: vals = {} vals['partner_id'] = add.partner_id.id vals['email'] = add.email @@ -87,12 +88,12 @@ def _action_import_adresses(self, cr, uid, data, context): vals['street2'] = add.street2 vals['city'] = add.city # Validating the mail - if add.email : + if add.email: if re.match( "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$", add.email) is None or\ re.search(u"[éèàêöüäï&]", add.email) is not None: - msg=u'Addresse %s for partner %s has email that is invalid %s'%( - unicode(vals['firstname']) +' '+ unicode(vals['lastname']), + msg = u'Addresse %s for partner %s has email that is invalid %s' % ( + unicode(vals['firstname']) + ' ' + unicode(vals['lastname']), add.partner_id.name, unicode(add.email) ) @@ -100,60 +101,59 @@ def _action_import_adresses(self, cr, uid, data, context): error_report.append(msg) vals['email'] = False # Validating the Phone - for key in phone_fields : - if not unicode(vals[key]).startswith('+') or unicode(vals[key]).find("\n") != -1\ - or re.search(u"[éèàêöüä#&]", unicode(vals[key])) is not None: + for key in phone_fields: + if not unicode(vals[key]).startswith('+') or unicode(vals[key]).find("\n") != -1\ + or re.search(u"[éèàêöüä#&]", unicode(vals[key])) is not None: vals[key] = False - msg = u'Addresse %s for partner %s has %s that is invalid '%( - unicode(vals['firstname']) +' '+ unicode(vals['lastname']), + msg = u'Addresse %s for partner %s has %s that is invalid ' % ( + unicode(vals['firstname']) + ' ' + unicode(vals['lastname']), add.partner_id.name, key - ) + ) logger.notifyChannel('ldap export', netsvc.LOG_INFO, msg) error_report.append(msg) # Validating the CN if not add.lastname and add.firstname: - msg = u'!!! Addresse %s for partner %s has no last name and first name that is valid partner name was used'%( - unicode(add.id), - add.partner_id.name, - ) + msg = (u'!!! Address %s for partner %s has no last name and first name that is valid partner name was used' + % (unicode(add.id), add.partner_id.name)) logger.notifyChannel('ldap export', netsvc.LOG_INFO, msg) error_report.append(msg) # We save to LDAP - add.write(vals, {'init_mode':True}) - #we by pass the encoding errors - map(lambda x: unicodedata.normalize("NFKD",x).encode('ascii','ignore'), error_report) + add.write(vals, {'init_mode': True}) + # we by pass the encoding errors + map(lambda x: unicodedata.normalize("NFKD", x).encode('ascii', 'ignore'), error_report) error_report = "\n".join(error_report) logger.notifyChannel("MY TOPIC", netsvc.LOG_ERROR, error_report) try: - data= base64.encodestring(error_report.encode()) - except Exception, e: - data= base64.encodestring("Could not generate report file. Please look in the log for details") + data = base64.encodestring(error_report.encode()) + except Exception: + data = base64.encodestring("Could not generate report file. Please look in the log for details") return {'errors': data} + class Wiz_import_addresses(wizard.interface): states = { 'init': { 'actions': [], 'result': { - 'type': 'form', - 'arch':_FORM, - 'fields':{}, - 'state':[ - ('end','Cancel'), - ('importadd','Export adresses into company LDAP') - ] - } + 'type': 'form', + 'arch': _FORM, + 'fields': {}, + 'state': [ + ('end', 'Cancel'), + ('importadd', 'Export adresses into company LDAP'), + ], + } }, 'importadd': { 'actions': [_action_import_adresses], 'result': { - 'state':[('end', 'OK', 'gtk-ok', True)], - 'arch' : _FORM1, - 'fields' : _FIELDS, - 'type':'form' - } + 'state': [('end', 'OK', 'gtk-ok', True)], + 'arch': _FORM1, + 'fields': _FIELDS, + 'type': 'form', + } } } Wiz_import_addresses('ldap.import_adresses')