Merge lp:~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin_python3 into lp:~therp-nl/therp-addons/7.0

[Holger Brunn (Therp)]

[lp:~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin_python3]

124. By Holger Brunn (Therp) on 2014-08-07

[FIX] report_aeroo_ooo_plugin: remove debug statement

[Stefan Rijnhart (Opener) (stefan-opener)]

Great, tnx!

review: Approve

[lp:~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin_python3]

125. By Holger Brunn (Therp) on 2014-09-05

[FIX] name_get returns a list, not a dictionary

126. By Holger Brunn (Therp) on 2014-09-10

[IMP] report_aeroo_ooo_plugin_save_addressee: Also hide delete button in
form view

127. By Holger Brunn (Therp) on 2014-09-10

[IMP] allow deleting mail merges via the UI

=== modified file 'report_aeroo_ooo_plugin/__openerp__.py'
--- report_aeroo_ooo_plugin/__openerp__.py	2014-09-10 10:40:09 +0000
+++ report_aeroo_ooo_plugin/__openerp__.py	2014-09-10 10:40:10 +0000
@@ -60,7 +60,7 @@
 Manager -> Add. After installation, restart Writer in order to see the newly
 created menus.
 
-You also need python-uno (*not python3-uno*) installed on the client machines.
+You also need python-uno (or python3-uno) installed on the client machines.
 
 Configure access to your database via Tools -> Options -> LibreOffice Writer ->
 Odoo Options.
@@ -71,7 +71,7 @@
 If you experience an empty configuration dialog or missing translations,
 probably your extension registry is corrupt.
 
-``rm -rf ~/.config/libreoffice/4/user{extensions,uno_packages}``
+``rm -rf ~/.config/libreoffice/4/user/{extensions,uno_packages}``
 
 fixes the problem, but you lose all installed extensions, their configuration
 and you'll have to reinstall them.

=== modified file 'report_aeroo_ooo_plugin/plugin/OpenERP_Aeroo.py'
--- report_aeroo_ooo_plugin/plugin/OpenERP_Aeroo.py	2014-09-10 10:40:09 +0000
+++ report_aeroo_ooo_plugin/plugin/OpenERP_Aeroo.py	2014-09-10 10:40:10 +0000
@@ -25,6 +25,7 @@
 import base64
 import tempfile
 import traceback
+import codecs
 from com.sun.star.task import XJobExecutor
 
 try:
@@ -113,7 +114,7 @@
             password,
             'instant.aeroo',
             'create_report',
-            base64.encodestring(data),
+            codecs.decode(base64.encodestring(data), 'ascii'),
             filter_id
             )
         if res:
@@ -124,8 +125,9 @@
                 tempFile = tempfile.mkstemp('.odt')
                 os.close(tempFile[0])
                 filename = tempFile[1]
-                FileUtils.write_data_to_file(filename,
-                                             base64.decodestring(res[0]))
+                FileUtils.write_data_to_file(
+                    filename,
+                    base64.decodestring(codecs.encode(res[0], 'ascii')))
                 Desktop.loadComponentFromURL(
                     Danny.convertToURL(filename), "_blank", 0, ())
             else:

=== modified file 'report_aeroo_ooo_plugin/plugin/description.xml'
--- report_aeroo_ooo_plugin/plugin/description.xml	2014-09-10 10:40:09 +0000
+++ report_aeroo_ooo_plugin/plugin/description.xml	2014-09-10 10:40:10 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="0.2.0"/>
+    <version value="0.2.1"/>
     <identifier value="org.odoo.report_aeroo_ooo_plugin"/>
     <display-name>
         <name lang="en">Odoo Mail Merge</name>

=== modified file 'report_aeroo_ooo_plugin/plugin/pythonpath/FileUtils.py'
--- report_aeroo_ooo_plugin/plugin/pythonpath/FileUtils.py	2012-07-09 13:47:10 +0000
+++ report_aeroo_ooo_plugin/plugin/pythonpath/FileUtils.py	2014-09-10 10:40:10 +0000
@@ -20,21 +20,24 @@
 #
 ##############################################################################
 import os
-import urllib
+try:
+    from urllib import unquote
+except ImportError:
+    from urllib.parse import unquote
 
 def get_absolute_file_path( url ):
-	url_unquoted = urllib.unquote(url)
+	url_unquoted = unquote(url)
 	return os.name == 'nt' and url_unquoted[1:] or url_unquoted 
 
 # This function reads the content of a file and return it to the caller
 def read_data_from_file( filename ):
-	fp = file( filename, "rb" )
+	fp = open( filename, "rb" )
 	data = fp.read()
 	fp.close()
 	return data
 
 # This function writes the content to a file
 def write_data_to_file( filename, data ):
-	fp = file( filename, 'wb' )
+	fp = open( filename, 'wb' )
 	fp.write( data )
 	fp.close()

=== modified file 'report_aeroo_ooo_plugin/plugin/pythonpath/Localization.py'
--- report_aeroo_ooo_plugin/plugin/pythonpath/Localization.py	2014-09-10 10:40:09 +0000
+++ report_aeroo_ooo_plugin/plugin/pythonpath/Localization.py	2014-09-10 10:40:10 +0000
@@ -14,6 +14,7 @@
 import sys
 import uno
 import unohelper
+import logging
 
 def typednamedvalues( type, *args, **kwargs ):
     if args:
@@ -53,8 +54,8 @@
                 'org.odoo.report_aeroo_ooo_plugin.OpenERPOptions/ConfigNode')
             self.initpath()
             self.initlanguage()
-        except Exception, e:
-            print >> sys.stderr, e
+        except Exception as e:
+            logging.exception(e)
 
     def getconfig( self, nodepath, update = False ):
         if update:
@@ -68,7 +69,7 @@
 
     def initlanguage( self ):
         config = self.getconfig( '/org.openoffice.Setup' )
-        self.uilanguage = config.L10N.ooLocale.encode( 'ascii' ).split( '-' )[0]
+        self.uilanguage = config.L10N.ooLocale.encode( 'ascii' ).split(b'-')[0]
         if self.uilanguage not in self.SUPPORTED_LANGUAGES:
             self.uilanguage = self.SUPPORTED_LANGUAGES[0]
 
@@ -78,8 +79,8 @@
         if not hasattr( self, 'localization' ):
             try:
                 self.loadlocalization()
-            except Exception, e:
-                print e
+            except Exception as e:
+                logging.exception(e)
         if string not in self.localization: return 'unlocalized: %s' % string
         if language in self.localization[string]:
             return self.localization[string][language]
@@ -95,21 +96,24 @@
                     'Dialogs',
                     self.__class__.__name__
                     )
-	    for f in glob.glob(os.path.join(path, 'DialogStrings_*.properties')):
-		    sf = os.path.split( f )[-1]
-		    lang = sf[sf.index( '_' )+1:sf.index( '_' )+3]
-		    for l in file( f ):
-			    l = l.split( '#' )[0].strip()
-			    if len( l ) == 0: continue
-			    assert '=' in l
-			    key, value = l.split( '=', 1 )
-			    key = key.strip()
-			    value = value.strip()
-			    if key not in self.localization:
-				    self.localization[key] = {}
-			    self.localization[key][lang] = value.decode( 'unicode_escape' ).replace( '\\', '' )
-        except Exception, e:
-            print >> sys.stderr, e
+            for f in glob.glob(os.path.join(path, 'DialogStrings_*.properties')):
+                sf = os.path.split( f )[-1]
+                lang = sf[sf.index( '_' )+1:sf.index( '_' )+3]
+                for l in open( f ):
+                    l = l.split( '#' )[0].strip()
+                    if len( l ) == 0: continue
+                    assert '=' in l
+                    key, value = l.split( '=', 1 )
+                    key = key.strip()
+                    value = value.strip()
+                    if key not in self.localization:
+                        self.localization[key] = {}
+                        if hasattr(value, 'decode'):
+                            self.localization[key][lang] = value.decode( 'unicode_escape' ).replace( '\\', '' )
+                        else:
+                            self.localization[key][lang] = value.encode('ascii').decode('unicode_escape').replace( '\\', '' )
+        except Exception as e:
+            logging.exception(e)
 
 # uno implementation
 g_ImplementationHelper = unohelper.ImplementationHelper()

=== modified file 'report_aeroo_ooo_plugin/plugin/pythonpath/OptionsHandler.py'
--- report_aeroo_ooo_plugin/plugin/pythonpath/OptionsHandler.py	2014-09-10 10:40:09 +0000
+++ report_aeroo_ooo_plugin/plugin/pythonpath/OptionsHandler.py	2014-09-10 10:40:10 +0000
@@ -83,7 +83,7 @@
             for key, value in cfg_values.items():
                 ConfigWriter.replaceByName(key, value)
             ConfigWriter.commitChanges()
-        except Exception, e:
+        except Exception as e:
             log(e)
 
     def get_options(self):

=== modified file 'report_aeroo_ooo_plugin/plugin/pythonpath/TinySocket.py'
--- report_aeroo_ooo_plugin/plugin/pythonpath/TinySocket.py	2012-07-09 13:47:10 +0000
+++ report_aeroo_ooo_plugin/plugin/pythonpath/TinySocket.py	2014-09-10 10:40:10 +0000
@@ -20,14 +20,33 @@
 #
 ##############################################################################
 import sys
+import logging
 import socket
-import cPickle
-import cStringIO
-import xmlrpclib
+try:
+    import cPickle
+except ImportError:
+    import pickle as cPickle
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
+try:
+    import xmlrpclib
+except ImportError:
+    import xmlrpc.client as xmlrpclib
 import re
 import traceback
 import Localization
 
+#http://stackoverflow.com/a/11301781
+try:
+    isinstance("", basestring)
+    def isstr(s):
+        return isinstance(s, basestring)
+except NameError:
+    def isstr(s):
+        return isinstance(s, str) or isinstance(s, bytes)
+
 class Myexception(Exception):
     def __init__(self, faultCode, faultString):
         self.faultCode = faultCode
@@ -60,14 +79,14 @@
         while totalsent < size:
             sent = self.sock.send(msg[totalsent:])
             if sent == 0:
-                raise RuntimeError, "socket connection broken"
+                raise RuntimeError("socket connection broken")
             totalsent = totalsent + sent
     def myreceive(self):
         buf=''
         while len(buf) < 8:
             chunk = self.sock.recv(8 - len(buf))
             if chunk == '':
-                raise RuntimeError, "socket connection broken"
+                raise RuntimeError("socket connection broken")
             buf += chunk
         size = int(buf)
         buf = self.sock.recv(1)
@@ -79,9 +98,9 @@
         while len(msg) < size:
             chunk = self.sock.recv(size-len(msg))
             if chunk == '':
-                raise RuntimeError, "socket connection broken"
+                raise RuntimeError("socket connection broken")
             msg = msg + chunk
-        msgio = cStringIO.StringIO(msg)
+        msgio = StringIO(msg)
         unpickler = cPickle.Unpickler(msgio)
         unpickler.find_global = None
         res = unpickler.load()
@@ -122,7 +141,7 @@
     def __init__(self, ctx, url):
         try:
             super(RPCSession, self).__init__(ctx, url)
-        except Exception, e:
+        except Exception as e:
             print >> sys.stderr, e
         m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$', url or '')
         if not m:
@@ -165,16 +184,16 @@
         try:
             result = self.gateway.execute(obj, method, *args)
             return self.__convert(result)
-        except Exception,e:
-          info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+        except Exception as e:
+            logging.exception(e)
 
     def __convert(self, result):
 
-        if isinstance(result, basestring):
+        if isstr(result):
             # try to convert into unicode string
             try:
                 return ustr(result)
-            except Exception, e:
+            except Exception as e:
                 return result
 
         elif isinstance(result, list):
@@ -207,7 +226,7 @@
         sock = xmlrpclib.ServerProxy(rpc_url + 'db')
         try:
             return sock.list()
-        except Exception, e:
+        except Exception as e:
             return -1
 
     def login(self, db, user, password):
@@ -220,8 +239,8 @@
         socket.setdefaulttimeout(10)
         try:
             res = sock.login(db, user, password)
-        except Exception, e:
-            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+        except Exception as e:
+            logging.exception(e)
             return -1
         finally:
             socket.setdefaulttimeout(oldtimeout)
@@ -250,7 +269,7 @@
             res = sock.myreceive()
             sock.disconnect()
             return res
-        except Exception, e:
+        except Exception as e:
             return -1
 
     def login(self, db, user, password):
@@ -260,7 +279,7 @@
             sock.mysend(('common', 'login', db, user, password))
             res = sock.myreceive()
             sock.disconnect()
-        except Exception, e:
+        except Exception as e:
             return -1
         return res
     def execute(self,obj, method, *args):
@@ -273,5 +292,5 @@
             sock.disconnect()
             return res
 
-        except Exception,e:
-            info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
+        except Exception as e:
+            logging.exception(e)

=== modified file 'report_aeroo_ooo_plugin_save_addressee/model/aeroo_mailmerge.py'
--- report_aeroo_ooo_plugin_save_addressee/model/aeroo_mailmerge.py	2014-09-10 10:40:09 +0000
+++ report_aeroo_ooo_plugin_save_addressee/model/aeroo_mailmerge.py	2014-09-10 10:40:10 +0000
@@ -48,11 +48,11 @@
                 cr, uid, [('code', '=', user.partner_id.lang)],
                 context=context)[0],
             context=context)
-        return dict([
+        return [
             (this.id, '%s [%s]' % (
                 this.filter_id.name,
                 datetime.datetime.strptime(
                     this.create_date, DEFAULT_SERVER_DATETIME_FORMAT).strftime(
                     lang.date_format)))
             for this in self.browse(cr, uid, ids, context=context)
-        ])
+        ]

=== modified file 'report_aeroo_ooo_plugin_save_addressee/view/aeroo_mailmerge.xml'
--- report_aeroo_ooo_plugin_save_addressee/view/aeroo_mailmerge.xml	2014-09-10 10:40:09 +0000
+++ report_aeroo_ooo_plugin_save_addressee/view/aeroo_mailmerge.xml	2014-09-10 10:40:10 +0000
@@ -4,7 +4,7 @@
         <record id="form_aeroo_mailmerge" model="ir.ui.view">
             <field name="model">aeroo.mailmerge</field>
             <field name="arch" type="xml">
-                <form string="Mail merges" version="7.0" create="0">
+                <form string="Mail merges" version="7.0" create="0" delete="1">
                     <sheet>
                         <group>
                             <field name="create_date" />
@@ -33,7 +33,7 @@
          <record id="tree_aeroo_mailmerge" model="ir.ui.view">
             <field name="model">aeroo.mailmerge</field>
             <field name="arch" type="xml">
-                <tree string="Mail merges" create="0" delete="0">
+                <tree string="Mail merges" create="0" delete="1">
                     <field name="create_date" />
                     <field name="create_uid" />
                     <field name="filter_id" />