From: sbh (Open ERP) Date: Thu, 11 Nov 2010 06:29:29 +0000 (+0530) Subject: [Fix] buildbot warning for outlook plugin X-Git-Tag: 6.0.0-server~17^2~178 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=b1404aa2c1741c4b82a497b842927c9238958bbe;p=odoo%2Fodoo.git [Fix] buildbot warning for outlook plugin bzr revid: sbh@tinyerp.com-20101111062929-zigzcuavfs6y3m4b --- diff --git a/addons/outlook/plugin/openerp-outlook-plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py index 8b376a5..549ee7b 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/addin.py @@ -24,9 +24,7 @@ ############################################################################## from win32com import universal -from win32com.server.exception import COMException from win32com.client import gencache, DispatchWithEvents -import winerror import pythoncom from win32com.client import constants import sys @@ -57,12 +55,10 @@ global NewConn # Retrieves registered XMLRPC connection def GetConn(): d=Dispatch("Python.OpenERP.XMLRpcConn") - mngr = manager.GetManager() return d class Configuration: def OnClick(self, button, cancel): - import win32ui try: mngr = manager.GetManager() mngr.ShowManager() @@ -91,8 +87,6 @@ class ViewPartners: # class OpenPartner: def OnClick(self, button, cancel): - import win32ui - from manager import ustr mngr = manager.GetManager() data=mngr.LoadConfig() outlook = Dispatch("Outlook.Application") @@ -192,7 +186,6 @@ class OutlookAddin: item.Enabled = True # Adding Menu in Menu Bar to the Web Menu of the Outlook - toolbaradvance = bars.Item("Advanced") toolbarweb = bars.Item("Web") item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True) diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py index f5e6036..c78895e 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py @@ -25,7 +25,6 @@ from processors import * from opt_processors import * -import sys import os import addin from dialogs import ShowDialog, MakePropertyPage @@ -301,7 +300,7 @@ class WEBOKButtonProcessor(ButtonProcessor): server = win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[0]) try: port = int(win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[1])) - except ValueError, e: + except ValueError: win32ui.MessageBox("Port should be an integer", "OpenERP Connection", flag_excl) return if server.strip() == "" or server.strip() == "http:\\\\": @@ -412,7 +411,6 @@ class DialogCommand(ButtonProcessor): def TestConnection(btnProcessor,*args): server = NewConn.getitem('_server') port = NewConn.getitem('_port') - url = NewConn.getitem('_uri') NewConn.GetDBList() if str(NewConn.getitem('_running')) == 'False': btnProcessor.window.LoadAllControls() @@ -590,7 +588,6 @@ def DeleteSelectedObjects(btnProcessor,*args): for n in extra: nombre = n.tostring() sel_text = nombre[0:r] - s = win32gui.SendMessage(hwndList, commctrl.LVM_DELETEITEM, sel) try: NewConn.DeleteObject(sel_text) except Exception,e: @@ -622,8 +619,6 @@ def GetSelectedItems(hwndList): def MakeAttachment(btnProcessor,*args): #Check if server running or user logged in - from win32com.client import Dispatch - import win32com b = check() if not b: return @@ -712,7 +707,7 @@ def GetSearchText(txtProcessor,*args): mail = ex.Selection.Item(1) try: search_text = ustr(mail.SenderEmailAddress).encode('iso-8859-1') - except Exception,e: + except Exception: pass win32gui.SendMessage(search_box, win32con.WM_SETTEXT, 0, search_text) txtProcessor.init_done=True @@ -837,7 +832,6 @@ def CreateContact(btnProcessor,*args): win32ui.MessageBox("Contact name or Email id is Missing\nPlease fill those information", "Create Contact", flag_error) return try: - id = NewConn.CreateContact(str(res)) if not partner: msg="New contact created." else: @@ -860,7 +854,6 @@ def SetAllText(txtProcessor,*args): url = NewConn.getitem('_uri') tbox = txtProcessor.GetControl() win32gui.SendMessage(tbox, win32con.WM_SETTEXT, 0, str(url)) - k=win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id) uname = NewConn.getitem('_uname') tbox = txtProcessor.GetControl(txtProcessor.other_ids[0]) win32gui.SendMessage(tbox, win32con.WM_SETTEXT, 0, str(uname)) @@ -926,9 +919,6 @@ def SetDefaultList(listProcessor,*args): def SetDefaultContact(txtProcessor,*args): # Acquiring the control of the text box - txt_name = txtProcessor.GetControl() - txt_email = txtProcessor.GetControl(txtProcessor.other_ids[0]) - global name global email global partner_ref @@ -958,7 +948,7 @@ def SetDefaultContact(txtProcessor,*args): mail = GetMail(txtProcessor) name = ustr(mail.SenderName).encode('iso-8859-1') email = ustr(mail.SenderEmailAddress).encode('iso-8859-1') - except Exception,e: + except Exception: pass win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id,name) @@ -968,7 +958,6 @@ def SetDefaultContact(txtProcessor,*args): def setCheckList(groupProcessor,*args): try: - child_style = win32con.BS_AUTOCHECKBOX | win32con.WS_TABSTOP hinst = win32gui.dllhandle objs = groupProcessor.window.manager.config['objects'] ins_objs = NewConn.GetAllObjects() @@ -977,7 +966,6 @@ def setCheckList(groupProcessor,*args): cnt=0 id=4001 id1=6001 - load_bmp_flags=win32con.LR_LOADFROMFILE | win32con.LR_LOADTRANSPARENT if groupProcessor.init_done: return else: @@ -1049,7 +1037,6 @@ def set_name_email(dialogProcessor,*args): #setting values to the appropriate text areas def GetDefaultEmail(txtProcessor,*args): - from win32com.client import Dispatch import win32con b = check() global partner_ref @@ -1093,7 +1080,7 @@ def GetDefaultEmail(txtProcessor,*args): #Fetching Sender MailID from Selected Mail try: search_partner_text = ustr(mail.SenderEmailAddress).encode('iso-8859-1') - except Exception,e: + except Exception: win32ui.MessageBox("Error In reading email ID from Email ","Open Contact", flag_error) pass win32gui.SendMessage(search_partner_box, win32con.WM_SETTEXT, 0, search_partner_text) @@ -1320,7 +1307,7 @@ def SelectPartnerFromList(btnProcessor,*args): return try: partner_ref = str(sel_text) - except Exception,e: + except Exception: pass win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1]) return @@ -1362,7 +1349,6 @@ def ConnectWebServer(btnProcessor, *args): def OpenPartnerForm(txtProcessor,*args): - from win32com.client import Dispatch import win32con b = check() if not b: @@ -1378,7 +1364,7 @@ def OpenPartnerForm(txtProcessor,*args): partner_text = ustr(mail.SenderName).encode('iso-8859-1') sender_mail = ustr(mail.SenderEmailAddress).encode('iso-8859-1') - except Exception,e: + except Exception: win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Error in reading email.>") pass vals = NewConn.SearchPartner(sender_mail) @@ -1405,12 +1391,10 @@ def OpenPartnerForm(txtProcessor,*args): txtProcessor.init_done=True def SerachOpenDocuemnt(txtProcessor,*args): - from win32com.client import Dispatch import win32con import win32ui import win32com - from win32com.mapi import mapi, mapiutil, mapitags - import pythoncom + from win32com.mapi import mapitags b = check() if not b: return @@ -1431,7 +1415,6 @@ def SerachOpenDocuemnt(txtProcessor,*args): message_id = None try: - outlook = win32com.client.Dispatch("Outlook.Application") session = win32com.client.Dispatch("MAPI.session") session.Logon('Outlook') objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID) @@ -1542,7 +1525,7 @@ def SelectCountryFromList(btnProcessor,*args): country_ref = str(sel_text) new_con_country = str(sel_text) search_country = str(sel_text) - except Exception,e: + except Exception: pass win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1]) return @@ -1631,7 +1614,7 @@ def SelectStateFromList(btnProcessor,*args): state_ref = str(sel_text) new_con_state = str(sel_text) win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1]) - except Exception,e: + except Exception: pass return diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py index 3883e08..b8ed64d 100644 --- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py +++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py @@ -23,13 +23,11 @@ import xmlrpclib import sys import socket import os -import pythoncom import time from manager import ustr -import email -from win32com.mapi import mapi, mapiutil, mapitags +from win32com.mapi import mapitags import pythoncom -import win32com +import win32com import win32ui waittime = 10 wait_count = 0 @@ -136,11 +134,11 @@ class XMLRpcConn(object): break def ArchiveToOpenERP(self, recs, mail): - import win32ui, win32con + import win32con conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/object') import eml flag = False - new_msg = files = ext_msg ="" + new_msg = ext_msg ="" message_id = referances = None try: outlook = win32com.client.Dispatch("Outlook.Application") @@ -170,7 +168,6 @@ class XMLRpcConn(object): except Exception,e: win32ui.MessageBox(str(e),"Archive To OpenERP") return - new_mail=eml.generateEML(mail) attachments=mail.Attachments for rec in recs: #[('res.partner', 3, 'Agrolait')] model = rec[0] @@ -229,7 +226,6 @@ class XMLRpcConn(object): return obj_list def GetPartners(self, search_partner=''): - import win32ui conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object') ids=[] obj_list=[] @@ -247,7 +243,6 @@ class XMLRpcConn(object): return obj_list def GetObjectItems(self, search_list=[], search_text=''): - import win32ui res = [] conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object') for obj in search_list: @@ -272,7 +267,6 @@ class XMLRpcConn(object): return res def CreateCase(self, section, mail, partner_ids, with_attachments=True): - import win32ui import eml flag = False id = -1 @@ -380,7 +374,6 @@ class XMLRpcConn(object): return id def SearchPartnerDetail(self, search_email_id): - import win32ui res_vals = [] address = {} conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object') @@ -393,7 +386,6 @@ class XMLRpcConn(object): return res_vals def WritePartnerValues(self, new_vals): - import win32ui flag = -1 new_dict = dict(new_vals) email=new_dict['email'] @@ -429,7 +421,6 @@ class XMLRpcConn(object): return flag def GetAllState(self): - import win32ui state_list = [] state_ids = [] conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object') @@ -440,7 +431,6 @@ class XMLRpcConn(object): return state_list def GetAllCountry(self): - import win32ui country_list = [] country_ids = [] conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object') @@ -451,7 +441,6 @@ class XMLRpcConn(object): return country_list def SearchPartner(self, mail_id = ""): - import win32ui conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object') address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(mail_id))]) if not address: @@ -466,11 +455,9 @@ class XMLRpcConn(object): return partner_id[0] def SearchEmailResources(self, message_id): - import win32ui import eml conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object') - sub = "" res_vals = [] mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message', 'search', [('message_id','=',message_id)]) if not mail_id: @@ -498,7 +485,6 @@ class XMLRpcConn(object): return obj_list def GetStates(self, state_search='', country=None): - import win32ui conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object') ids = [] c_id = [] @@ -521,8 +507,6 @@ class XMLRpcConn(object): obj_list.sort(lambda x, y: cmp(x[1],y[1])) return obj_list def FindCountryForState(self, state_search=''): - import win32ui - res_vals = [] conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object') ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',[('name','=',ustr(state_search))]) if not ids: @@ -531,7 +515,6 @@ class XMLRpcConn(object): country = object['country_id'][1] return country def CreateEmailAttachment(self, rec, email): - result = {} conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object') att_folder_path = os.path.abspath(os.path.dirname("%temp%\\")) if not os.path.exists(att_folder_path): @@ -556,14 +539,12 @@ class XMLRpcConn(object): f = fn.split('.') fn = f[0][0:l] + '.' + f[-1] fn = fn+'.txt' - att_path = os.path.join(att_folder_path,fn) f=open(fn,"w") f.writelines(ustr(email.Body).encode('iso-8859-1')) f.close() f=open(fn,"r") content = "".join(f.readlines()).encode('base64') f.close() - att_path = os.path.join(att_folder_path,fn) res['name'] = ustr(sub) res['datas_fname'] = ustr(fn) res['datas'] = content