Merge lp:~danilo/launchpad/invalid-messages into lp:~launchpad/launchpad/recife

[Данило Шеган]

= Get rid of getPOTMsgSetWithErrors =

This branch initially started as an effort to port it to the new data
model we are introducing in our integration branch (branch this is
proposed for merge to).

However, it turned out that this method is not used anywhere except in
tests, so I decided to do a better thing: get rid of altogether.

There was one mention of a work-around in the code in the integration
branch as-is due to this method not being ported, but I just removed the
work-around and the tests for getPOTMsgSetWithErrors, and we were all
good (ran the full translations test suite).

Lint reports a few issues that I am not touching right now because
they'd mean serious refactoring of doc/pofile.txt test (it uses long
string comparisons over multiple lines, and lint complains if a single
string goes over 78 characters, regardless of whether it's on a single
line: no lines go over 78 though).

== Tests ==

Basically, all translation tests:

  bin/test -m lp.translations

[Aaron Bentley (abentley)]

Hard to find style errors with the removal of code :-)

review: Approve

=== modified file 'lib/lp/translations/doc/pofile.txt'
--- lib/lp/translations/doc/pofile.txt	2010-11-18 11:55:23 +0000
+++ lib/lp/translations/doc/pofile.txt	2010-11-18 18:24:11 +0000
@@ -52,9 +52,6 @@
     >>> dummy_pofile.getPOTMsgSetWithNewSuggestions().count()
     0
 
-    >>> dummy_pofile.getPOTMsgSetWithErrors().count()
-    0
-
     >>> dummy_pofile.getPOTMsgSetUntranslated().count()
     22
 

=== modified file 'lib/lp/translations/doc/poimport.txt'
--- lib/lp/translations/doc/poimport.txt	2010-11-18 14:00:48 +0000
+++ lib/lp/translations/doc/poimport.txt	2010-11-18 18:24:11 +0000
@@ -333,21 +333,6 @@
     >>> print message
     None
 
-We can also get the ones that have validation errors.
-
-    >>> potmsgsets = pofile.getPOTMsgSetWithErrors()
-    >>> potmsgsets.count()
-    1
-
-    >>> for potmsgset in potmsgsets:
-    ...     translationmessages = potmsgset.getLocalTranslationMessages(
-    ...         pofile.potemplate, pofile.language)
-    ...     for translationmessage in translationmessages:
-    ...         assert (
-    ...             translationmessage.validation_status ==
-    ...             TranslationValidationStatus.UNKNOWNERROR), (
-    ...             "Doesn't have a validation error")
-
 Check that the plural form was imported correctly.
 
     >>> potmsgset = pofile.potemplate.getPOTMsgSetByMsgIDText(

=== modified file 'lib/lp/translations/interfaces/pofile.py'
--- lib/lp/translations/interfaces/pofile.py	2010-11-09 06:55:07 +0000
+++ lib/lp/translations/interfaces/pofile.py	2010-11-18 18:24:11 +0000
@@ -195,9 +195,6 @@
         through Launchpad.
         """
 
-    def getPOTMsgSetWithErrors():
-        """Get message sets that have translations imported with errors."""
-
     def getTranslationsFilteredBy(person):
         """Get TranslationMessages in this `IPOFile` contributed by `person`.
 

=== modified file 'lib/lp/translations/model/pofile.py'
--- lib/lp/translations/model/pofile.py	2010-11-17 15:19:31 +0000
+++ lib/lp/translations/model/pofile.py	2010-11-18 18:24:11 +0000
@@ -94,7 +94,6 @@
     )
 from lp.translations.interfaces.translationmessage import (
     RosettaTranslationOrigin,
-    TranslationValidationStatus,
     )
 from lp.translations.interfaces.translations import TranslationConstants
 from lp.translations.model.pomsgid import POMsgID
@@ -738,20 +737,6 @@
         query = ' AND '.join(clauses)
         return self._getOrderedPOTMsgSets(clause_tables, query)
 
-    def getPOTMsgSetWithErrors(self):
-        """See `IPOFile`."""
-        clauses = self._getClausesForPOFileMessages()
-        clauses.extend([
-            'TranslationTemplateItem.potmsgset = POTMsgSet.id',
-            'TranslationMessage.is_current_upstream IS TRUE',
-            'TranslationMessage.validation_status <> %s' % sqlvalues(
-                TranslationValidationStatus.OK),
-            ])
-
-        query = ' AND '.join(clauses)
-        origin = [POTMsgSet, TranslationMessage, TranslationTemplateItem]
-        return self._getOrderedPOTMsgSets(origin, query)
-
     def messageCount(self):
         """See `IRosettaStats`."""
         return self.potemplate.messageCount()
@@ -1255,10 +1240,6 @@
         """See `IPOFile`."""
         return EmptyResultSet()
 
-    def getPOTMsgSetWithErrors(self):
-        """See `IPOFile`."""
-        return EmptyResultSet()
-
     def getTranslationMessages(self, condition=None):
         """See `IPOFile`."""
         return EmptyResultSet()

=== modified file 'lib/lp/translations/tests/test_pofile.py'
--- lib/lp/translations/tests/test_pofile.py	2010-11-18 12:01:49 +0000
+++ lib/lp/translations/tests/test_pofile.py	2010-11-18 18:24:11 +0000
@@ -36,7 +36,6 @@
 from lp.translations.interfaces.translationgroup import TranslationPermission
 from lp.translations.interfaces.translationmessage import (
     RosettaTranslationOrigin,
-    TranslationValidationStatus,
     )
 from lp.translations.interfaces.translationsperson import ITranslationsPerson
 
@@ -815,17 +814,6 @@
             self.devel_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(found_translations, [self.potmsgset])
 
-    def test_getPOTMsgSetWithErrors(self):
-        # Test listing of POTMsgSets with errors in translations.
-        translation = self.factory.makeSharedTranslationMessage(
-            pofile=self.devel_pofile, potmsgset=self.potmsgset,
-            translations=[u"Imported translation"], is_current_upstream=True)
-        removeSecurityProxy(translation).validation_status = (
-            TranslationValidationStatus.UNKNOWNERROR)
-        found_translations = list(
-            self.devel_pofile.getPOTMsgSetWithErrors())
-        self.assertEquals(found_translations, [self.potmsgset])
-
     def test_updateStatistics(self):
         # Test that updating statistics keeps working.
 
@@ -1363,46 +1351,6 @@
         self.assertEquals(
             [self.potmsgset1, self.potmsgset2], potmsgsets)
 
-    def test_getPOTMsgSetWithErrors_ordering(self):
-        # Suggest a translation on both POTMsgSets in devel_pofile,
-        # so they are returned with getPOTMsgSetWithNewSuggestions() call.
-        imported1 = self.factory.makeSharedTranslationMessage(
-            pofile=self.devel_pofile,
-            potmsgset=self.potmsgset1,
-            translations=["Imported"],
-            is_current_upstream=True)
-        removeSecurityProxy(imported1).validation_status = (
-            TranslationValidationStatus.UNKNOWNERROR)
-        imported2 = self.factory.makeSharedTranslationMessage(
-            pofile=self.devel_pofile,
-            potmsgset=self.potmsgset2,
-            translations=["Another imported"],
-            is_current_upstream=True)
-        removeSecurityProxy(imported2).validation_status = (
-            TranslationValidationStatus.UNKNOWNERROR)
-
-        potmsgsets = list(
-            self.devel_pofile.getPOTMsgSetWithErrors())
-        self.assertEquals(
-            [self.potmsgset1, self.potmsgset2], potmsgsets)
-
-        # Insert these two POTMsgSets into self.stable_potemplate in reverse
-        # order.
-        self.potmsgset2.setSequence(self.stable_potemplate, 1)
-        self.potmsgset1.setSequence(self.stable_potemplate, 2)
-
-        # And they are returned in the new order as desired.
-        potmsgsets = list(
-            self.stable_pofile.getPOTMsgSetWithErrors())
-        self.assertEquals(
-            [self.potmsgset2, self.potmsgset1], potmsgsets)
-
-        # Order is unchanged for the previous template.
-        potmsgsets = list(
-            self.devel_pofile.getPOTMsgSetWithErrors())
-        self.assertEquals(
-            [self.potmsgset1, self.potmsgset2], potmsgsets)
-
     def test_getPOTMsgSets_ordering(self):
         # Both POTMsgSets in devel_potemplate are untranslated.
         potmsgsets = list(

=== modified file 'lib/lp/translations/utilities/translation_import.py'
--- lib/lp/translations/utilities/translation_import.py	2010-11-18 12:04:42 +0000
+++ lib/lp/translations/utilities/translation_import.py	2010-11-18 18:24:11 +0000
@@ -564,13 +564,6 @@
         if validation_ok and self.is_editor:
             return self._approveMessage(potmsgset, new_message, message_data)
 
-        if self.translation_import_queue_entry.by_maintainer:
-            # XXX: henninge 2010-09-21: Mixed models!
-            # This is mimicking the old behavior to still mark these messages
-            # as "imported". Will have to be removed when
-            # getPOTMsgSetsWithErrors is updated to the new model.
-            new_message.makeCurrentUpstream(True)
-
         return new_message
 
     def importMessage(self, message):