[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 (file)
--- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
@@ -24,9 +24,7 @@
 ##############################################################################\r
 \r
 from win32com import universal\r
-from win32com.server.exception import COMException\r
 from win32com.client import gencache, DispatchWithEvents\r
-import winerror\r
 import pythoncom\r
 from win32com.client import constants\r
 import sys\r
@@ -57,12 +55,10 @@ global NewConn
 # Retrieves registered XMLRPC connection\r
 def GetConn():\r
     d=Dispatch("Python.OpenERP.XMLRpcConn")\r
-    mngr = manager.GetManager()\r
     return d\r
 \r
 class Configuration:\r
     def OnClick(self, button, cancel):\r
-        import win32ui\r
         try:\r
             mngr = manager.GetManager()\r
             mngr.ShowManager()\r
@@ -91,8 +87,6 @@ class ViewPartners:
 #\r
 class OpenPartner:\r
        def OnClick(self, button, cancel):\r
-               import win32ui\r
-               from manager import ustr\r
                mngr = manager.GetManager()\r
                data=mngr.LoadConfig()\r
                outlook = Dispatch("Outlook.Application")\r
@@ -192,7 +186,6 @@ class OutlookAddin:
             item.Enabled = True\r
 \r
             # Adding Menu in Menu Bar to the Web Menu of the Outlook\r
-            toolbaradvance = bars.Item("Advanced")\r
             toolbarweb = bars.Item("Web")\r
 \r
             item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)\r

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 (file)
--- 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 @@
 \r
 from processors import *\r
 from opt_processors import *\r
-import sys\r
 import os\r
 import addin\r
 from dialogs import ShowDialog, MakePropertyPage\r
@@ -301,7 +300,7 @@ class WEBOKButtonProcessor(ButtonProcessor):
         server = win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[0])\r
         try:\r
             port = int(win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[1]))\r
-        except ValueError, e:\r
+        except ValueError:\r
             win32ui.MessageBox("Port should be an integer", "OpenERP Connection", flag_excl)\r
             return\r
         if server.strip() == "" or server.strip() == "http:\\\\":\r
@@ -412,7 +411,6 @@ class DialogCommand(ButtonProcessor):
 def TestConnection(btnProcessor,*args):\r
     server = NewConn.getitem('_server')\r
     port = NewConn.getitem('_port')\r
-    url = NewConn.getitem('_uri')\r
     NewConn.GetDBList()\r
     if str(NewConn.getitem('_running')) == 'False':\r
         btnProcessor.window.LoadAllControls()\r
@@ -590,7 +588,6 @@ def DeleteSelectedObjects(btnProcessor,*args):
         for n in extra:\r
             nombre = n.tostring()\r
             sel_text = nombre[0:r]\r
-        s = win32gui.SendMessage(hwndList, commctrl.LVM_DELETEITEM, sel)\r
         try:\r
             NewConn.DeleteObject(sel_text)\r
         except Exception,e:\r
@@ -622,8 +619,6 @@ def GetSelectedItems(hwndList):
 \r
 def MakeAttachment(btnProcessor,*args):\r
     #Check if server running or user logged in\r
-    from win32com.client import Dispatch\r
-    import win32com\r
     b = check()\r
     if not b:\r
         return\r
@@ -712,7 +707,7 @@ def GetSearchText(txtProcessor,*args):
     mail = ex.Selection.Item(1)\r
     try:\r
         search_text = ustr(mail.SenderEmailAddress).encode('iso-8859-1')\r
-    except Exception,e:\r
+    except Exception:\r
         pass\r
     win32gui.SendMessage(search_box, win32con.WM_SETTEXT, 0, search_text)\r
     txtProcessor.init_done=True\r
@@ -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)\r
         return\r
     try:\r
-        id = NewConn.CreateContact(str(res))\r
         if not partner:\r
             msg="New contact created."\r
         else:\r
@@ -860,7 +854,6 @@ def SetAllText(txtProcessor,*args):
     url = NewConn.getitem('_uri')\r
     tbox = txtProcessor.GetControl()\r
     win32gui.SendMessage(tbox, win32con.WM_SETTEXT, 0, str(url))\r
-    k=win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id)\r
     uname = NewConn.getitem('_uname')\r
     tbox = txtProcessor.GetControl(txtProcessor.other_ids[0])\r
     win32gui.SendMessage(tbox, win32con.WM_SETTEXT, 0, str(uname))\r
@@ -926,9 +919,6 @@ def SetDefaultList(listProcessor,*args):
 \r
 def SetDefaultContact(txtProcessor,*args):\r
     # Acquiring the control of the text box\r
-    txt_name = txtProcessor.GetControl()\r
-    txt_email = txtProcessor.GetControl(txtProcessor.other_ids[0])\r
-\r
     global name\r
     global email\r
     global partner_ref\r
@@ -958,7 +948,7 @@ def SetDefaultContact(txtProcessor,*args):
         mail = GetMail(txtProcessor)\r
         name = ustr(mail.SenderName).encode('iso-8859-1')\r
         email = ustr(mail.SenderEmailAddress).encode('iso-8859-1')\r
-    except Exception,e:\r
+    except Exception:\r
         pass\r
 \r
     win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id,name)\r
@@ -968,7 +958,6 @@ def SetDefaultContact(txtProcessor,*args):
 \r
 def setCheckList(groupProcessor,*args):\r
     try:\r
-        child_style = win32con.BS_AUTOCHECKBOX | win32con.WS_TABSTOP\r
         hinst = win32gui.dllhandle\r
         objs = groupProcessor.window.manager.config['objects']\r
         ins_objs = NewConn.GetAllObjects()\r
@@ -977,7 +966,6 @@ def setCheckList(groupProcessor,*args):
         cnt=0\r
         id=4001\r
         id1=6001\r
-        load_bmp_flags=win32con.LR_LOADFROMFILE | win32con.LR_LOADTRANSPARENT\r
         if groupProcessor.init_done:\r
            return\r
         else:\r
@@ -1049,7 +1037,6 @@ def set_name_email(dialogProcessor,*args):
 #setting values to the appropriate text areas\r
 def GetDefaultEmail(txtProcessor,*args):\r
 \r
-    from win32com.client import Dispatch\r
     import win32con\r
     b = check()\r
     global partner_ref\r
@@ -1093,7 +1080,7 @@ def GetDefaultEmail(txtProcessor,*args):
     #Fetching Sender MailID from Selected Mail\r
     try:\r
         search_partner_text = ustr(mail.SenderEmailAddress).encode('iso-8859-1')\r
-    except Exception,e:\r
+    except Exception:\r
         win32ui.MessageBox("Error In reading email ID from Email ","Open Contact", flag_error)\r
         pass\r
     win32gui.SendMessage(search_partner_box, win32con.WM_SETTEXT, 0, search_partner_text)\r
@@ -1320,7 +1307,7 @@ def SelectPartnerFromList(btnProcessor,*args):
             return\r
         try:\r
             partner_ref = str(sel_text)\r
-        except Exception,e:\r
+        except Exception:\r
             pass\r
         win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])\r
         return\r
@@ -1362,7 +1349,6 @@ def ConnectWebServer(btnProcessor, *args):
 \r
 \r
 def OpenPartnerForm(txtProcessor,*args):\r
-    from win32com.client import Dispatch\r
     import win32con\r
     b = check()\r
     if not b:\r
@@ -1378,7 +1364,7 @@ def OpenPartnerForm(txtProcessor,*args):
        partner_text = ustr(mail.SenderName).encode('iso-8859-1')\r
         sender_mail = ustr(mail.SenderEmailAddress).encode('iso-8859-1')\r
 \r
-    except Exception,e:\r
+    except Exception:\r
        win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Error in reading email.>")\r
        pass\r
     vals = NewConn.SearchPartner(sender_mail)\r
@@ -1405,12 +1391,10 @@ def OpenPartnerForm(txtProcessor,*args):
     txtProcessor.init_done=True\r
 \r
 def SerachOpenDocuemnt(txtProcessor,*args):\r
-    from win32com.client import Dispatch\r
     import win32con\r
     import win32ui\r
     import win32com\r
-    from win32com.mapi import mapi, mapiutil, mapitags\r
-    import pythoncom\r
+    from win32com.mapi import  mapitags\r
     b = check()\r
     if not b:\r
         return\r
@@ -1431,7 +1415,6 @@ def SerachOpenDocuemnt(txtProcessor,*args):
 \r
     message_id = None\r
     try:\r
-        outlook = win32com.client.Dispatch("Outlook.Application")\r
         session = win32com.client.Dispatch("MAPI.session")\r
         session.Logon('Outlook')\r
         objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)\r
@@ -1542,7 +1525,7 @@ def SelectCountryFromList(btnProcessor,*args):
             country_ref = str(sel_text)\r
             new_con_country = str(sel_text)\r
             search_country = str(sel_text)\r
-        except Exception,e:\r
+        except Exception:\r
             pass\r
         win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])\r
         return\r
@@ -1631,7 +1614,7 @@ def SelectStateFromList(btnProcessor,*args):
             state_ref = str(sel_text)\r
             new_con_state = str(sel_text)\r
             win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.other_ids[1])\r
-        except Exception,e:\r
+        except Exception:\r
             pass\r
 \r
         return\r

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 (file)
--- 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\r
 import socket\r
 import os\r
-import pythoncom\r
 import time\r
 from manager import ustr\r
-import email\r
-from win32com.mapi import mapi, mapiutil, mapitags\r
+from win32com.mapi import mapitags\r
 import pythoncom\r
-import win32com\r
+import win32com \r
 import win32ui\r
 waittime = 10\r
 wait_count = 0\r
@@ -136,11 +134,11 @@ class XMLRpcConn(object):
                        break\r
 \r
     def ArchiveToOpenERP(self, recs, mail):\r
-       import win32ui, win32con\r
+       import  win32con\r
        conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/object')\r
        import eml\r
        flag = False\r
-       new_msg = files = ext_msg =""\r
+       new_msg =  ext_msg =""\r
        message_id = referances  = None\r
        try:\r
                outlook = win32com.client.Dispatch("Outlook.Application")\r
@@ -170,7 +168,6 @@ class XMLRpcConn(object):
        except Exception,e:\r
                win32ui.MessageBox(str(e),"Archive To OpenERP")\r
                return\r
-       new_mail=eml.generateEML(mail)\r
        attachments=mail.Attachments\r
        for rec in recs: #[('res.partner', 3, 'Agrolait')]\r
                model = rec[0]\r
@@ -229,7 +226,6 @@ class XMLRpcConn(object):
        return obj_list\r
 \r
     def GetPartners(self, search_partner=''):\r
-       import win32ui\r
        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')\r
        ids=[]\r
        obj_list=[]\r
@@ -247,7 +243,6 @@ class XMLRpcConn(object):
        return obj_list\r
 \r
     def GetObjectItems(self, search_list=[], search_text=''):\r
-       import win32ui\r
        res = []\r
        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')\r
        for obj in search_list:\r
@@ -272,7 +267,6 @@ class XMLRpcConn(object):
        return res\r
 \r
     def CreateCase(self, section, mail, partner_ids, with_attachments=True):\r
-       import win32ui\r
        import eml\r
        flag = False\r
        id = -1\r
@@ -380,7 +374,6 @@ class XMLRpcConn(object):
        return id\r
 \r
     def SearchPartnerDetail(self, search_email_id):\r
-       import win32ui\r
        res_vals = []\r
        address = {}\r
        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')\r
@@ -393,7 +386,6 @@ class XMLRpcConn(object):
        return res_vals\r
 \r
     def WritePartnerValues(self, new_vals):\r
-       import win32ui\r
        flag = -1\r
        new_dict = dict(new_vals)\r
        email=new_dict['email']\r
@@ -429,7 +421,6 @@ class XMLRpcConn(object):
        return flag\r
 \r
     def GetAllState(self):\r
-       import win32ui\r
        state_list = []\r
        state_ids = []\r
        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')\r
@@ -440,7 +431,6 @@ class XMLRpcConn(object):
        return state_list\r
 \r
     def GetAllCountry(self):\r
-       import win32ui\r
        country_list = []\r
        country_ids = []\r
        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')\r
@@ -451,7 +441,6 @@ class XMLRpcConn(object):
        return country_list\r
 \r
     def SearchPartner(self, mail_id = ""):\r
-       import win32ui\r
        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')\r
        address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(mail_id))])\r
        if not address:\r
@@ -466,11 +455,9 @@ class XMLRpcConn(object):
                return partner_id[0]\r
 \r
     def SearchEmailResources(self, message_id):\r
-       import win32ui\r
        import eml\r
 \r
        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')\r
-       sub = ""\r
        res_vals = []\r
        mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message', 'search', [('message_id','=',message_id)])\r
        if not mail_id:\r
@@ -498,7 +485,6 @@ class XMLRpcConn(object):
        return obj_list\r
 \r
     def GetStates(self, state_search='', country=None):\r
-       import win32ui\r
        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')\r
        ids = []\r
        c_id = []\r
@@ -521,8 +507,6 @@ class XMLRpcConn(object):
                obj_list.sort(lambda x, y: cmp(x[1],y[1]))\r
        return obj_list\r
     def FindCountryForState(self, state_search=''):\r
-       import win32ui\r
-       res_vals = []\r
        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')\r
        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',[('name','=',ustr(state_search))])\r
        if not ids:\r
@@ -531,7 +515,6 @@ class XMLRpcConn(object):
        country = object['country_id'][1]\r
        return country\r
     def CreateEmailAttachment(self, rec, email):\r
-       result = {}\r
        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')\r
         att_folder_path = os.path.abspath(os.path.dirname("%temp%\\"))\r
         if not os.path.exists(att_folder_path):\r
@@ -556,14 +539,12 @@ class XMLRpcConn(object):
                        f = fn.split('.')\r
                        fn = f[0][0:l] + '.' + f[-1]\r
         fn = fn+'.txt'\r
-        att_path = os.path.join(att_folder_path,fn)\r
         f=open(fn,"w")\r
         f.writelines(ustr(email.Body).encode('iso-8859-1'))\r
         f.close()\r
         f=open(fn,"r")\r
         content = "".join(f.readlines()).encode('base64')\r
         f.close()\r
-        att_path = os.path.join(att_folder_path,fn)\r
         res['name'] = ustr(sub)\r
         res['datas_fname'] = ustr(fn)\r
         res['datas'] = content\r