Merge lp:~jtv/launchpad/recife-548805 into lp:~launchpad/launchpad/recife

[Jeroen T. Vermeulen]

Retire TranslationMessage.is_current_* validators.

= Bug 548805 =

This branch gets rid of the validators for the TranslationMessage.is_current_* flags. These validators, when setting either of these flags, first un-set the respective flag on an existing message that the subject message replaces. The validators make the management of these flags very non-transparent, making it hard to re-work it all as we're trying to do.

There's also a drive-by where a test for the remove-translations-by script still used obsolete option names from before these flags were renamed.

Jeroen

[Aaron Bentley (abentley)]

Consider using storm.locals to make future imports simpler. Either way, approved.

review: Approve

=== modified file 'lib/lp/translations/doc/remove-translations-by.txt'
--- lib/lp/translations/doc/remove-translations-by.txt	2010-03-23 19:31:02 +0000
+++ lib/lp/translations/doc/remove-translations-by.txt	2010-03-31 16:46:33 +0000
@@ -89,8 +89,8 @@
     ...     '--potemplate=%s' % str(potemplate.id),
     ...     '--not-language',
     ...     '--language=%s' % 'de',
-    ...     '--is-current=%s' % 'true',
-    ...     '--is-imported=%s' % 'false',
+    ...     '--is-current-ubuntu=%s' % 'true',
+    ...     '--is-current-upstream=%s' % 'false',
     ...     '--msgid=%s' % "My goose is undercooked.",
     ...     '--origin=%s' % 'ROSETTAWEB',
     ...     '--force',

=== modified file 'lib/lp/translations/interfaces/translationmessage.py'
--- lib/lp/translations/interfaces/translationmessage.py	2010-03-23 15:39:12 +0000
+++ lib/lp/translations/interfaces/translationmessage.py	2010-03-31 16:46:33 +0000
@@ -240,6 +240,21 @@
             HTML element id.
         """
 
+    def makeCurrentUbuntu(new_value=True):
+        """Set the `is_current_ubuntu` flag.
+
+        If setting to True, clears the flag on any competing
+        TranslationMessages.
+        """
+
+    def makeCurrentUpstream(new_value=True):
+        """Set the `is_current_upstream` flag.
+
+        If setting to True, clears the flag on any competing
+        TranslationMessages.
+        """
+
+
 
 class ITranslationMessageSuggestions(Interface):
     """Suggested `ITranslationMessage`s for a `POTMsgSet`.

=== modified file 'lib/lp/translations/model/potmsgset.py'
--- lib/lp/translations/model/potmsgset.py	2010-03-26 20:21:58 +0000
+++ lib/lp/translations/model/potmsgset.py	2010-03-31 16:46:33 +0000
@@ -702,11 +702,11 @@
                     # Either converge_shared==True, or a new message.
                     new_message.potemplate = None
 
-                new_message.is_current_ubuntu = True
+                new_message.makeCurrentUbuntu()
             else:
                 new_message.potemplate = None
         if is_current_upstream or new_message == upstream_message:
-            new_message.is_current_upstream = True
+            new_message.makeCurrentUpstream()
 
 
     def _isTranslationMessageASuggestion(self, force_suggestion,

=== modified file 'lib/lp/translations/model/translationmessage.py'
--- lib/lp/translations/model/translationmessage.py	2010-03-23 21:20:54 +0000
+++ lib/lp/translations/model/translationmessage.py	2010-03-31 16:46:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -155,62 +155,11 @@
         # This object is already non persistent, so nothing needs to be done.
         return
 
-
-def validate_is_current_ubuntu(self, attr, value):
-    """Unset current Ubuntu message before selecting new one as current.
-
-    :param value: Whether we want this translation message as the new
-        current one.
-
-    If there is already another current message, we unset it first.
-    """
-    assert value is not None, 'is_current_ubuntu field cannot be None.'
-
-    if value and not self.is_current_ubuntu:
-        # We are setting this message as the current one. We need to
-        # change current one to non current before.
-        current_translation_message = (
-            self.potmsgset.getCurrentTranslationMessage(
-                self.potemplate,
-                self.language, self.variant))
-        if (current_translation_message is not None and
-            current_translation_message.potemplate == self.potemplate):
-            current_translation_message.is_current_ubuntu = False
-            # We need to flush the old current message before the
-            # new one because the database constraints prevent two
-            # current messages.
-            Store.of(self).add_flush_order(current_translation_message,
-                                           self)
-
-    return value
-
-def validate_is_current_upstream(self, attr, value):
-    """Unset current upstream message before activing this one as upstream.
-
-    :param value: Whether we want this translation message as the new
-        upstream one.
-
-    If there is already another upstream message, we unset it first.
-    """
-    assert value is not None, 'is_current_upstream field cannot be None.'
-
-    if value and not self.is_current_upstream:
-        # We are setting this message as the current one. We need to
-        # change current one to non current before.
-        upstream_translation_message = (
-            self.potmsgset.getImportedTranslationMessage(
-                self.potemplate,
-                self.language, self.variant))
-        if (upstream_translation_message is not None and
-            upstream_translation_message.potemplate == self.potemplate):
-            upstream_translation_message.is_current_upstream = False
-            # We need to flush the old upstream message before the
-            # new one because the database constraints prevent two
-            # upstream messages.
-            Store.of(self).add_flush_order(upstream_translation_message,
-                                           self)
-
-    return value
+    def makeCurrentUbuntu(self, new_value=True):
+        self.is_current_ubuntu = new_value
+
+    def makeCurrentUpstream(self, new_value=True):
+        self.is_current_upstream = new_value
 
 
 class TranslationMessage(SQLBase, TranslationMessageMixIn):
@@ -263,11 +212,9 @@
         dbName='validation_status', notNull=True,
         schema=TranslationValidationStatus)
     is_current_ubuntu = BoolCol(
-        dbName='is_current_ubuntu', notNull=True, default=False,
-        storm_validator=validate_is_current_ubuntu)
+        dbName='is_current_ubuntu', notNull=True, default=False)
     is_current_upstream = BoolCol(
-        dbName='is_current_upstream', notNull=True, default=False,
-        storm_validator=validate_is_current_upstream)
+        dbName='is_current_upstream', notNull=True, default=False)
     was_obsolete_in_last_import = BoolCol(
         dbName='was_obsolete_in_last_import', notNull=True, default=False)
 
@@ -475,6 +422,37 @@
 
         return twins.order_by(TranslationMessage.id).first()
 
+    def makeCurrentUbuntu(self, new_value=True):
+        """See `ITranslationMessage`."""
+        if new_value and not self.is_current_ubuntu:
+            incumbent = self.potmsgset.getCurrentTranslationMessage(
+                self.potemplate, self.language, self.variant)
+            if incumbent == self:
+                return
+            if (incumbent is not None and
+                incumbent.potemplate == self.potemplate):
+                # The incumbent is in the way.  Clear its flag.
+                incumbent.is_current_ubuntu = False
+                Store.of(self).add_flush_order(incumbent, self)
+
+        self.is_current_ubuntu = new_value
+
+    def makeCurrentUpstream(self, new_value=True):
+        """See `ITranslationMessage`."""
+        if new_value and not self.is_current_upstream:
+            incumbent = self.potmsgset.getImportedTranslationMessage(
+                self.potemplate, self.language, self.variant)
+            if incumbent == self:
+                return
+            if (incumbent is not None and
+                incumbent.potemplate == self.potemplate):
+                # The incumbent is in the way.  Clear its flag.
+                incumbent.is_current_upstream = False
+                Store.of(self).add_flush_order(incumbent, self)
+
+        self.is_current_upstream = new_value
+
+
 
 class TranslationMessageSet:
     """See `ITranslationMessageSet`."""

=== modified file 'lib/lp/translations/scripts/gettext_check_messages.py'
--- lib/lp/translations/scripts/gettext_check_messages.py	2010-03-26 14:34:55 +0000
+++ lib/lp/translations/scripts/gettext_check_messages.py	2010-03-31 16:46:33 +0000
@@ -7,6 +7,8 @@
 
 from datetime import timedelta, datetime
 
+from storm.locals import Store
+
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
@@ -136,6 +138,8 @@
             self._disable_count += 1
             if imported is not None:
                 imported.is_current_ubuntu = True
+                Store.of(imported).add_flush_order(
+                    translationmessage, imported)
                 self._unmask_count += 1
 
     def _do_commit(self):

=== modified file 'lib/lp/translations/scripts/message_sharing_migration.py'
--- lib/lp/translations/scripts/message_sharing_migration.py	2010-03-23 15:39:12 +0000
+++ lib/lp/translations/scripts/message_sharing_migration.py	2010-03-31 16:46:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -10,6 +10,8 @@
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
+from storm.locals import Store
+
 from canonical.launchpad.scripts.logger import log, DEBUG2
 from canonical.launchpad.utilities.orderingcheck import OrderingCheck
 from lp.translations.interfaces.potemplate import IPOTemplateSet
@@ -147,12 +149,16 @@
         # Transfer is_current_ubuntu flag.
         source_message.is_current_ubuntu = False
         target_message.is_current_ubuntu = True
+        Store.of(source_message).add_flush_order(
+            source_message, target_message)
 
     if (source_message.is_current_upstream and
         not target_message.is_current_upstream):
         # Transfer is_current_upstream flag.
         source_message.is_current_upstream = False
         target_message.is_current_upstream = True
+        Store.of(source_message).add_flush_order(
+            source_message, target_message)
 
     source_message.destroySelf()