Merge lp:~therp-nl/aeroo/7.0-lp1226576-restore_babel_compatibility into lp:aeroo

[Stefan Rijnhart (Opener)]

Applied my own fix from http://bazaar.launchpad.net/~openerp/openobject-server/7.0/revision/5079 to Aeroo reports, which contains an overwrite of the affected method.

Unmerged revisions

6. By Stefan Rijnhart (Opener) on 2014-01-02

[FIX] Restore compatibility with Babel > 0.9.6

=== modified file 'report_aeroo/translate.py'
--- report_aeroo/translate.py	2013-05-16 15:53:25 +0000
+++ report_aeroo/translate.py	2014-01-02 15:08:05 +0000
@@ -308,8 +308,11 @@
         if module:
             src_file = open(fabsolutepath, 'r')
             try:
-                for lineno, message, comments in extract.extract(extract_method, src_file,
-                                                                 keywords=extract_keywords):
+                for extracted in extract.extract(extract_method, src_file,
+                                                 keywords=extract_keywords):
+                    # Babel 0.9.6 yields lineno, message, comments
+                    # Babel 1.3 yields lineno, message, comments, context
+                    lineno, message, comments = extracted[:3] 
                     push_translation(module, trans_type, display_path, lineno,
                                      encode(message), comments + extra_comments)
             except Exception: