Merge lp:~gary/launchpad/bug531071 into lp:launchpad

[Gary Poster]

address the primary memory leak discovered for bug 531071.

This branch addresses the primary memory leak discovered for bug 531071.

Danilo said the following on IRC: "moving it out of the function declaration is fine, but please do not do any bigger changes (we have a big feature branch in progress and don't want to get too many conflicts) unless it's really critical (i.e. this doesn't help enough)"

In that context, I did the minimum necessary (though my editor cleaned up a single trailing whitespace; I hope that is not painful).

I did not attempt to write a test for the memory leak. I think it would have been possible, but given that this is being refactored soon, I didn't feel it merited the effort involved.

As described in the bug, there's another change to be made in Zope infrastructure, but I do not believe it is pressing once this change is made. I intend for this change to close the bug.

Thank you.

[Данило Шеган (danilo)]

All good.

review: Approve

[Данило Шеган (danilo)]

You can probably QA this on staging as well by browsing through eg. https://translations.staging.launchpad.net/ubuntu/lucid/+lang/de pages (URLs ending with +translate will use this view), until you get enough leakage to confirm it's happening or not :)

[Gary Poster (gary)]

Thanks to Danilo's help, I found out that https://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/es/+translate will dupe the problem on a developer machine. I'm using that to verify.

=== modified file 'lib/lp/translations/browser/translationmessage.py'
--- lib/lp/translations/browser/translationmessage.py	2010-04-11 20:04:15 +0000
+++ lib/lp/translations/browser/translationmessage.py	2010-05-19 15:31:31 +0000
@@ -295,7 +295,7 @@
                     'Anonymous users or users who are not accepting our '
                     'licensing terms cannot do POST submissions.')
             translations_person = ITranslationsPerson(self.user)
-            if (translations_person.translations_relicensing_agreement 
+            if (translations_person.translations_relicensing_agreement
                     is not None and
                 not translations_person.translations_relicensing_agreement):
                 raise UnexpectedFormData, (
@@ -1553,6 +1553,10 @@
                     is_empty=False))
         self.seen_translations = seen_translations
 
+
+class Submission:
+    """A submission generated from a TranslationMessage"""
+
 def convert_translationmessage_to_submission(
     message, current_message, plural_form, pofile, legal_warning_needed,
     is_empty=False, packaged=False):
@@ -1565,9 +1569,6 @@
     :param is_empty: Is the submission empty or not.
     """
 
-    class Submission:
-        pass
-
     submission = Submission()
     submission.translationmessage = message
     for attribute in ['id', 'language', 'potmsgset', 'pofile',