Merge lp:~sinzui/launchpad/question-enums-0 into lp:launchpad

[Curtis Hovey]

Rename answers/interfaces/questionenums to answers/enums.

    Launchpad bug: https://bugs.launchpad.net/bugs/771321
    Pre-implementation: no one

Move and rename questionenums to the newer standard of enums. Consolidate
enums into that module.

--------------------------------------------------------------------

RULES

    * Use the migration script to rename the module.
    * Move the QUESTION_STATUS_DEFAULT_SEARCH in to enums.

QA

    None, this is a pure refactoring.

LINT

    lib/canonical/launchpad/database/launchpadstatistic.py
    lib/lp/answers/enums.py
    lib/lp/answers/karma.py
    lib/lp/answers/notification.py
    lib/lp/answers/browser/faqcollection.py
    lib/lp/answers/browser/question.py
    lib/lp/answers/browser/questiontarget.py
    lib/lp/answers/browser/tests/views.txt
    lib/lp/answers/doc/expiration.txt
    lib/lp/answers/doc/karma.txt
    lib/lp/answers/doc/notifications.txt
    lib/lp/answers/doc/person.txt
    lib/lp/answers/doc/projectgroup.txt
    lib/lp/answers/doc/questionsets.txt
    lib/lp/answers/doc/questiontarget.txt
    lib/lp/answers/doc/workflow.txt
    lib/lp/answers/interfaces/question.py
    lib/lp/answers/interfaces/questioncollection.py
    lib/lp/answers/interfaces/questionmessage.py
    lib/lp/answers/interfaces/questionreopening.py
    lib/lp/answers/interfaces/questionsperson.py
    lib/lp/answers/interfaces/questiontarget.py
    lib/lp/answers/mail/handler.py
    lib/lp/answers/model/question.py
    lib/lp/answers/model/questionmessage.py
    lib/lp/answers/model/questionreopening.py
    lib/lp/answers/model/questionsperson.py
    lib/lp/answers/tests/emailinterface.txt
    lib/lp/answers/tests/test_question_workflow.py
    lib/lp/registry/browser/distributionsourcepackage.py
    lib/lp/registry/browser/person.py
    lib/lp/registry/model/distribution.py
    lib/lp/registry/model/product.py
    lib/lp/registry/model/projectgroup.py
    lib/lp/registry/model/sourcepackage.py

TEST

    ./bin/test -vv -m lp.answers

[Curtis Hovey (sinzui)]

Self-approved because these changes are mechanical and made/determined by scripts.

review: Approve (code)

=== modified file 'lib/canonical/launchpad/database/launchpadstatistic.py'
--- lib/canonical/launchpad/database/launchpadstatistic.py	2010-11-19 16:38:42 +0000
+++ lib/canonical/launchpad/database/launchpadstatistic.py	2011-04-26 21:01:43 +0000
@@ -29,7 +29,7 @@
     ILaunchpadStatistic,
     ILaunchpadStatisticSet,
     )
-from lp.answers.interfaces.questionenums import QuestionStatus
+from lp.answers.enums import QuestionStatus
 from lp.answers.model.question import Question
 from lp.app.enums import ServiceUsage
 from lp.bugs.model.bug import Bug
@@ -163,7 +163,7 @@
             Product.selectBy(license_reviewed=True, active=True).count())
 
     def _updateRosettaStatistics(self, ztm):
-        # XXX j.c.sackett 2010-11-19 bug=677532 It's less than ideal that 
+        # XXX j.c.sackett 2010-11-19 bug=677532 It's less than ideal that
         # this query is using _translations_usage, but there's no cleaner
         # way to deal with it. Once the bug above is resolved, this should
         # should be fixed to use translations_usage.

=== modified file 'lib/lp/answers/browser/faqcollection.py'
--- lib/lp/answers/browser/faqcollection.py	2010-11-23 23:22:27 +0000
+++ lib/lp/answers/browser/faqcollection.py	2011-04-26 21:01:43 +0000
@@ -25,10 +25,10 @@
     IFAQCollection,
     ISearchFAQsForm,
     )
-from lp.answers.interfaces.questioncollection import (
+from lp.answers.enums import (
+    QuestionSort,
     QUESTION_STATUS_DEFAULT_SEARCH,
     )
-from lp.answers.interfaces.questionenums import QuestionSort
 from lp.app.browser.launchpadform import (
     action,
     LaunchpadFormView,
@@ -147,5 +147,5 @@
                 status.title for status in QUESTION_STATUS_DEFAULT_SEARCH],
              'field.search_text': self.search_text,
              'field.actions.search': 'Search',
-             'field.sort' : QuestionSort.RELEVANCY.title,
+             'field.sort': QuestionSort.RELEVANCY.title,
              'field.language-empty-marker': 1}, doseq=True)

=== modified file 'lib/lp/answers/browser/question.py'
--- lib/lp/answers/browser/question.py	2011-04-18 01:07:08 +0000
+++ lib/lp/answers/browser/question.py	2011-04-26 21:01:43 +0000
@@ -90,7 +90,7 @@
     IQuestionLinkFAQForm,
     )
 from lp.answers.interfaces.questioncollection import IQuestionSet
-from lp.answers.interfaces.questionenums import (
+from lp.answers.enums import (
     QuestionAction,
     QuestionSort,
     QuestionStatus,
@@ -649,7 +649,7 @@
             # Remove the description widget.
             widgets = [(True, self.widgets[name])
                        for name in self.search_field_names]
-            self.widgets = form.Widgets(widgets, len(self.prefix)+1)
+            self.widgets = form.Widgets(widgets, len(self.prefix) + 1)
             return self.search_template()
         return self.continue_action.success(data)
 

=== modified file 'lib/lp/answers/browser/questiontarget.py'
--- lib/lp/answers/browser/questiontarget.py	2011-02-02 15:43:31 +0000
+++ lib/lp/answers/browser/questiontarget.py	2011-04-26 21:01:43 +0000
@@ -68,7 +68,7 @@
     IQuestionSet,
     ISearchableByQuestionOwner,
     )
-from lp.answers.interfaces.questionenums import QuestionStatus
+from lp.answers.enums import QuestionStatus
 from lp.answers.interfaces.questiontarget import (
     IQuestionTarget,
     ISearchQuestionsForm,

=== modified file 'lib/lp/answers/browser/tests/views.txt'
--- lib/lp/answers/browser/tests/views.txt	2011-04-26 03:29:28 +0000
+++ lib/lp/answers/browser/tests/views.txt	2011-04-26 21:01:43 +0000
@@ -818,7 +818,7 @@
 Specific views can provide a default filter by returning the default
 search parameters to use in the getDefaultFilter() method:
 
-    >>> from lp.answers.interfaces.questionenums import QuestionStatus
+    >>> from lp.answers.enums import QuestionStatus
     >>> MyCustomSearchQuestionsView.default_filter = {
     ...     'status': [QuestionStatus.SOLVED, QuestionStatus.INVALID],
     ...     'language' : search_view.user_support_languages}

=== modified file 'lib/lp/answers/doc/expiration.txt'
--- lib/lp/answers/doc/expiration.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/answers/doc/expiration.txt	2011-04-26 21:01:43 +0000
@@ -19,7 +19,7 @@
 
     # Sanity check in case somebody modifies the question sampledata and
     # forget to update this script.
-    >>> from lp.answers.interfaces.questionenums import QuestionStatus
+    >>> from lp.answers.enums import QuestionStatus
     >>> from lp.answers.model.question import Question
     >>> Question.select('status IN (%i,%i)' % (
     ...     QuestionStatus.OPEN.value,

=== modified file 'lib/lp/answers/doc/karma.txt'
--- lib/lp/answers/doc/karma.txt	2010-12-02 16:13:51 +0000
+++ lib/lp/answers/doc/karma.txt	2011-04-26 21:01:43 +0000
@@ -154,7 +154,7 @@
 We do not grant karma for status change made outside of workflow:
 
     >>> login('[e-mail]')
-    >>> from lp.answers.interfaces.questionenums import QuestionStatus
+    >>> from lp.answers.enums import QuestionStatus
     >>> msg = firefox_question.setStatus(
     ...     foo_bar, QuestionStatus.OPEN, 'That rejection was an error.',
     ...     datecreated=now.next())

=== modified file 'lib/lp/answers/doc/notifications.txt'
--- lib/lp/answers/doc/notifications.txt	2011-04-23 13:42:01 +0000
+++ lib/lp/answers/doc/notifications.txt	2011-04-26 21:01:43 +0000
@@ -725,7 +725,7 @@
 Notifications for setStatus()
 .............................
 
-    >>> from lp.answers.interfaces.questionenums import QuestionStatus
+    >>> from lp.answers.enums import QuestionStatus
     >>> login('[e-mail]')
     >>> message = ubuntu_question.setStatus(
     ...     foo_bar, QuestionStatus.SOLVED, "The rejection was a mistake.")

=== modified file 'lib/lp/answers/doc/person.txt'
--- lib/lp/answers/doc/person.txt	2011-02-17 17:02:54 +0000
+++ lib/lp/answers/doc/person.txt	2011-04-26 21:01:43 +0000
@@ -41,7 +41,7 @@
 relevancy.  One can use the sort parameter to change that.  It takes one of
 the constant defined in the QuestionSort enumeration.
 
-    >>> from lp.answers.interfaces.questionenums import QuestionSort
+    >>> from lp.answers.enums import QuestionSort
     >>> for question in foo_bar.searchQuestions(
     ...         search_text='firefox', sort=QuestionSort.OLDEST_FIRST):
     ...     print question.id, question.title, question.status.title
@@ -68,8 +68,9 @@
 As shown above, expired and invalid questions are not returned.  The status
 parameter can be used to control the list of statuses to select.
 
-    >>> from lp.answers.interfaces.questionenums import QuestionStatus
-    >>> for question in foo_bar.searchQuestions(status=QuestionStatus.INVALID):
+    >>> from lp.answers.enums import QuestionStatus
+    >>> for question in foo_bar.searchQuestions(
+    ...         status=QuestionStatus.INVALID):
     ...     print question.title, question.status.title
     Firefox is slow and consumes too much RAM   Invalid
 
@@ -92,7 +93,7 @@
 To select only questions on which the person commented, the
 QuestionParticipation.COMMENTER is used.
 
-    >>> from lp.answers.interfaces.questionenums import QuestionParticipation
+    >>> from lp.answers.enums import QuestionParticipation
     >>> for question in foo_bar.searchQuestions(
     ...         participation=QuestionParticipation.COMMENTER, status=None):
     ...     print question.title

=== modified file 'lib/lp/answers/doc/projectgroup.txt'
--- lib/lp/answers/doc/projectgroup.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/answers/doc/projectgroup.txt	2011-04-26 21:01:43 +0000
@@ -50,7 +50,7 @@
 Questions can be searched by all the standard searchQuestions() parameters.
 See questiontarget.txt for the full details.
 
-    >>> from lp.answers.interfaces.questionenums import (
+    >>> from lp.answers.enums import (
     ...     QuestionSort, QuestionStatus)
     >>> for question in mozilla_project.searchQuestions(
     ...     owner=sample_person, status=QuestionStatus.OPEN,

=== modified file 'lib/lp/answers/doc/questionsets.txt'
--- lib/lp/answers/doc/questionsets.txt	2011-03-23 16:28:51 +0000
+++ lib/lp/answers/doc/questionsets.txt	2011-04-26 21:01:43 +0000
@@ -67,7 +67,7 @@
 parameter can be used to select the questions in the status you are interested
 in.
 
-    >>> from lp.answers.interfaces.questionenums import QuestionStatus
+    >>> from lp.answers.enums import QuestionStatus
     >>> for question in question_set.searchQuestions(
     ...         status=QuestionStatus.INVALID):
     ...     print question.title, question.status.title, (
@@ -123,7 +123,7 @@
 relevancy.  One can use the sort parameter to change the order.  It takes one
 of the constant defined in the QuestionSort enumeration.
 
-    >>> from lp.answers.interfaces.questionenums import QuestionSort
+    >>> from lp.answers.enums import QuestionSort
     >>> for question in question_set.searchQuestions(
     ...         search_text='firefox', sort=QuestionSort.OLDEST_FIRST):
     ...     print question.id, ascii_smash(question.title), (
@@ -179,7 +179,7 @@
     >>> login('[e-mail]')
     >>> firefox.answers_usage = ServiceUsage.LAUNCHPAD
     >>> ubuntu.answers_usage = ServiceUsage.LAUNCHPAD
-    >>> transaction.commit()    
+    >>> transaction.commit()
 
 This method can be used to retrieve the projects that are the most actively
 using the Answer Tracker in the last 60 days.  By active, we mean that the

=== modified file 'lib/lp/answers/doc/questiontarget.txt'
--- lib/lp/answers/doc/questiontarget.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/answers/doc/questiontarget.txt	2011-04-26 21:01:43 +0000
@@ -178,7 +178,7 @@
 
 The searchQuestions() method can also filter questions by status.
 
-    >>> from lp.answers.interfaces.questionenums import QuestionStatus
+    >>> from lp.answers.enums import QuestionStatus
     >>> for t in target.searchQuestions(status=QuestionStatus.OPEN):
     ...     print t.title
     Another question
@@ -216,7 +216,7 @@
 
 You can sort also from oldest to newest using the OLDEST_FIRST constant.
 
-    >>> from lp.answers.interfaces.questionenums import QuestionSort
+    >>> from lp.answers.enums import QuestionSort
     >>> for t in target.searchQuestions(search_text='new',
     ...                                 sort=QuestionSort.OLDEST_FIRST):
     ...     print t.title

=== modified file 'lib/lp/answers/doc/workflow.txt'
--- lib/lp/answers/doc/workflow.txt	2011-04-21 02:10:29 +0000
+++ lib/lp/answers/doc/workflow.txt	2011-04-26 21:01:43 +0000
@@ -5,7 +5,7 @@
 The state of a question is tracked through its status, which model a
 question's lifecycle.  These are defined in the QuestionStatus enumeration.
 
-    >>> from lp.answers.interfaces.questionenums import QuestionStatus
+    >>> from lp.answers.enums import QuestionStatus
     >>> for status in QuestionStatus.items:
     ...     print status.name
     OPEN
@@ -18,7 +18,7 @@
 Status change occurs as a consequence of a user's action.  The possible
 actions are defined in the QuestionAction enumeration.
 
-    >>> from lp.answers.interfaces.questionenums import QuestionAction
+    >>> from lp.answers.enums import QuestionAction
     >>> for status in QuestionAction.items:
     ...     print status.name
     REQUESTINFO

=== renamed file 'lib/lp/answers/interfaces/questionenums.py' => 'lib/lp/answers/enums.py'
--- lib/lp/answers/interfaces/questionenums.py	2010-08-20 20:31:18 +0000
+++ lib/lp/answers/enums.py	2011-04-26 21:01:43 +0000
@@ -13,6 +13,7 @@
     'QuestionAction',
     'QuestionParticipation',
     'QuestionPriority',
+    'QUESTION_STATUS_DEFAULT_SEARCH',
     'QuestionSort',
     'QuestionStatus',
     ]
@@ -205,7 +206,7 @@
     RECENT_OWNER_ACTIVITY = Item("""
     recently updated first
 
-    Sort questions that recently received new information from the owner first.
+    Sort questions that received new information from the owner first.
     """)
 
 
@@ -262,3 +263,8 @@
         question, spam or anything that should not appear in the
         Answer Tracker.
         """)
+
+
+QUESTION_STATUS_DEFAULT_SEARCH = (
+    QuestionStatus.OPEN, QuestionStatus.NEEDSINFO, QuestionStatus.ANSWERED,
+    QuestionStatus.SOLVED)

=== modified file 'lib/lp/answers/interfaces/question.py'
--- lib/lp/answers/interfaces/question.py	2011-04-25 14:37:52 +0000
+++ lib/lp/answers/interfaces/question.py	2011-04-26 21:01:43 +0000
@@ -42,7 +42,7 @@
 
 from canonical.launchpad import _
 from lp.answers.interfaces.faq import IFAQ
-from lp.answers.interfaces.questionenums import (
+from lp.answers.enums import (
     QuestionPriority,
     QuestionStatus,
     )

=== modified file 'lib/lp/answers/interfaces/questioncollection.py'
--- lib/lp/answers/interfaces/questioncollection.py	2011-04-22 22:24:41 +0000
+++ lib/lp/answers/interfaces/questioncollection.py	2011-04-26 21:01:43 +0000
@@ -11,7 +11,6 @@
     'IQuestionCollection',
     'IQuestionSet',
     'ISearchableByQuestionOwner',
-    'QUESTION_STATUS_DEFAULT_SEARCH',
     ]
 
 from zope.interface import (
@@ -30,12 +29,7 @@
     )
 
 from canonical.launchpad import _
-from lp.answers.interfaces.questionenums import QuestionStatus
-
-
-QUESTION_STATUS_DEFAULT_SEARCH = (
-    QuestionStatus.OPEN, QuestionStatus.NEEDSINFO, QuestionStatus.ANSWERED,
-    QuestionStatus.SOLVED)
+from lp.answers.enums import QUESTION_STATUS_DEFAULT_SEARCH
 
 
 class IQuestionCollection(Interface):

=== modified file 'lib/lp/answers/interfaces/questionmessage.py'
--- lib/lp/answers/interfaces/questionmessage.py	2011-03-27 21:40:32 +0000
+++ lib/lp/answers/interfaces/questionmessage.py	2011-04-26 21:01:43 +0000
@@ -19,7 +19,7 @@
 
 from canonical.launchpad import _
 from canonical.launchpad.interfaces.message import IMessage
-from lp.answers.interfaces.questionenums import (
+from lp.answers.enums import (
     QuestionAction,
     QuestionStatus,
     )
@@ -52,4 +52,3 @@
         title=_("Message visibility."),
         description=_("Whether or not the message is visible."),
         readonly=True)
-

=== modified file 'lib/lp/answers/interfaces/questionreopening.py'
--- lib/lp/answers/interfaces/questionreopening.py	2010-08-20 20:31:18 +0000
+++ lib/lp/answers/interfaces/questionreopening.py	2011-04-26 21:01:43 +0000
@@ -20,7 +20,7 @@
 
 from canonical.launchpad import _
 from lp.answers.interfaces.question import IQuestion
-from lp.answers.interfaces.questionenums import QuestionStatus
+from lp.answers.enums import QuestionStatus
 from lp.registry.interfaces.person import IPerson
 
 

=== modified file 'lib/lp/answers/interfaces/questionsperson.py'
--- lib/lp/answers/interfaces/questionsperson.py	2011-04-23 02:31:00 +0000
+++ lib/lp/answers/interfaces/questionsperson.py	2011-04-26 21:01:43 +0000
@@ -9,10 +9,8 @@
     ]
 
 
-from lp.answers.interfaces.questioncollection import (
-    IQuestionCollection,
-    QUESTION_STATUS_DEFAULT_SEARCH,
-    )
+from lp.answers.enums import QUESTION_STATUS_DEFAULT_SEARCH
+from lp.answers.interfaces.questioncollection import IQuestionCollection
 
 
 class IQuestionsPerson(IQuestionCollection):

=== modified file 'lib/lp/answers/interfaces/questiontarget.py'
--- lib/lp/answers/interfaces/questiontarget.py	2010-08-20 20:31:18 +0000
+++ lib/lp/answers/interfaces/questiontarget.py	2011-04-26 21:01:43 +0000
@@ -24,11 +24,11 @@
 from canonical.launchpad import _
 from lp.answers.interfaces.questioncollection import (
     ISearchableByQuestionOwner,
-    QUESTION_STATUS_DEFAULT_SEARCH,
     )
-from lp.answers.interfaces.questionenums import (
+from lp.answers.enums import (
     QuestionSort,
     QuestionStatus,
+    QUESTION_STATUS_DEFAULT_SEARCH,
     )
 from lp.services.fields import PublicPersonChoice
 

=== modified file 'lib/lp/answers/karma.py'
--- lib/lp/answers/karma.py	2010-10-03 15:30:06 +0000
+++ lib/lp/answers/karma.py	2011-04-26 21:01:43 +0000
@@ -9,7 +9,7 @@
     ]
 
 from canonical.database.sqlbase import block_implicit_flushes
-from lp.answers.interfaces.questionenums import QuestionAction
+from lp.answers.enums import QuestionAction
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.product import IProduct
@@ -54,7 +54,7 @@
     QuestionAction.SETSTATUS: None,
     QuestionAction.COMMENT: 'questioncommentadded',
     QuestionAction.ANSWER: 'questiongaveanswer',
-    QuestionAction.CONFIRM: None,# Handled in giveAnswer() and confirmAnswer()
+    QuestionAction.CONFIRM: None,
     QuestionAction.EXPIRE: None,
     QuestionAction.REJECT: 'questionrejected',
     QuestionAction.REOPEN: 'questionreopened',

=== modified file 'lib/lp/answers/mail/handler.py'
--- lib/lp/answers/mail/handler.py	2010-12-13 15:25:03 +0000
+++ lib/lp/answers/mail/handler.py	2011-04-26 21:01:43 +0000
@@ -17,7 +17,7 @@
 from canonical.launchpad.interfaces.message import IMessageSet
 from canonical.launchpad.webapp.interfaces import ILaunchBag
 from lp.answers.interfaces.questioncollection import IQuestionSet
-from lp.answers.interfaces.questionenums import QuestionStatus
+from lp.answers.enums import QuestionStatus
 
 
 class AnswerTrackerHandler:

=== modified file 'lib/lp/answers/model/question.py'
--- lib/lp/answers/model/question.py	2011-04-25 14:37:52 +0000
+++ lib/lp/answers/model/question.py	2011-04-26 21:01:43 +0000
@@ -72,16 +72,14 @@
     InvalidQuestionStateError,
     IQuestion,
     )
-from lp.answers.interfaces.questioncollection import (
-    IQuestionSet,
-    QUESTION_STATUS_DEFAULT_SEARCH,
-    )
-from lp.answers.interfaces.questionenums import (
+from lp.answers.interfaces.questioncollection import IQuestionSet
+from lp.answers.enums import (
     QuestionAction,
     QuestionParticipation,
     QuestionPriority,
     QuestionSort,
     QuestionStatus,
+    QUESTION_STATUS_DEFAULT_SEARCH,
     )
 from lp.answers.interfaces.questiontarget import IQuestionTarget
 from lp.answers.model.answercontact import AnswerContact

=== modified file 'lib/lp/answers/model/questionmessage.py'
--- lib/lp/answers/model/questionmessage.py	2011-03-27 21:40:32 +0000
+++ lib/lp/answers/model/questionmessage.py	2011-04-26 21:01:43 +0000
@@ -18,7 +18,7 @@
 from canonical.database.enumcol import EnumCol
 from canonical.database.sqlbase import SQLBase
 from canonical.launchpad.interfaces.message import IMessage
-from lp.answers.interfaces.questionenums import (
+from lp.answers.enums import (
     QuestionAction,
     QuestionStatus,
     )

=== modified file 'lib/lp/answers/model/questionreopening.py'
--- lib/lp/answers/model/questionreopening.py	2011-02-03 19:27:54 +0000
+++ lib/lp/answers/model/questionreopening.py	2011-04-26 21:01:43 +0000
@@ -20,7 +20,7 @@
 from canonical.database.datetimecol import UtcDateTimeCol
 from canonical.database.enumcol import EnumCol
 from canonical.database.sqlbase import SQLBase
-from lp.answers.interfaces.questionenums import QuestionStatus
+from lp.answers.enums import QuestionStatus
 from lp.answers.interfaces.questionreopening import IQuestionReopening
 from lp.registry.interfaces.person import validate_public_person
 

=== modified file 'lib/lp/answers/model/questionsperson.py'
--- lib/lp/answers/model/questionsperson.py	2010-08-20 20:31:18 +0000
+++ lib/lp/answers/model/questionsperson.py	2011-04-26 21:01:43 +0000
@@ -11,9 +11,7 @@
 from zope.interface import implements
 
 from canonical.database.sqlbase import sqlvalues
-from lp.answers.interfaces.questioncollection import (
-    QUESTION_STATUS_DEFAULT_SEARCH,
-    )
+from lp.answers.enums import QUESTION_STATUS_DEFAULT_SEARCH
 from lp.answers.interfaces.questionsperson import IQuestionsPerson
 from lp.answers.model.answercontact import AnswerContact
 from lp.answers.model.question import QuestionPersonSearch

=== modified file 'lib/lp/answers/notification.py'
--- lib/lp/answers/notification.py	2011-04-25 14:37:52 +0000
+++ lib/lp/answers/notification.py	2011-04-26 21:01:43 +0000
@@ -16,7 +16,7 @@
     simple_sendmail,
     )
 from canonical.launchpad.webapp.publisher import canonical_url
-from lp.answers.interfaces.questionenums import QuestionAction
+from lp.answers.enums import QuestionAction
 from lp.registry.interfaces.person import IPerson
 from lp.services.mail.mailwrapper import MailWrapper
 from lp.services.mail.notificationrecipientset import NotificationRecipientSet

=== modified file 'lib/lp/answers/tests/emailinterface.txt'
--- lib/lp/answers/tests/emailinterface.txt	2011-02-02 15:21:08 +0000
+++ lib/lp/answers/tests/emailinterface.txt	2011-04-26 21:01:43 +0000
@@ -165,7 +165,7 @@
 
 And from the Needs information state:
 
-    >>> from lp.answers.interfaces.questionenums import QuestionStatus
+    >>> from lp.answers.enums import QuestionStatus
     >>> setQuestionStatus(question, QuestionStatus.NEEDSINFO)
 
     >>> msgid =  send_question_email(

=== modified file 'lib/lp/answers/tests/test_question_workflow.py'
--- lib/lp/answers/tests/test_question_workflow.py	2011-04-21 15:36:28 +0000
+++ lib/lp/answers/tests/test_question_workflow.py	2011-04-26 21:01:43 +0000
@@ -43,7 +43,7 @@
     InvalidQuestionStateError,
     IQuestion,
     )
-from lp.answers.interfaces.questionenums import (
+from lp.answers.enums import (
     QuestionAction,
     QuestionStatus,
     )

=== modified file 'lib/lp/registry/browser/distributionsourcepackage.py'
--- lib/lp/registry/browser/distributionsourcepackage.py	2011-03-29 22:34:04 +0000
+++ lib/lp/registry/browser/distributionsourcepackage.py	2011-04-26 21:01:43 +0000
@@ -55,7 +55,7 @@
     QuestionTargetFacetMixin,
     QuestionTargetTraversalMixin,
     )
-from lp.answers.interfaces.questionenums import QuestionStatus
+from lp.answers.enums import QuestionStatus
 from lp.app.browser.tales import CustomizableFormatter
 from lp.app.enums import ServiceUsage
 from lp.app.interfaces.launchpad import IServiceUsage

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2011-04-09 02:23:46 +0000
+++ lib/lp/registry/browser/person.py	2011-04-26 21:01:43 +0000
@@ -206,7 +206,7 @@
 from canonical.lazr.utils import smartquote
 from lp.answers.browser.questiontarget import SearchQuestionsView
 from lp.answers.interfaces.questioncollection import IQuestionSet
-from lp.answers.interfaces.questionenums import QuestionParticipation
+from lp.answers.enums import QuestionParticipation
 from lp.answers.interfaces.questionsperson import IQuestionsPerson
 from lp.app.browser.launchpadform import (
     action,
@@ -546,7 +546,7 @@
             # Otherwise we return the normal view for a person's
             # archive subscriptions.
             return queryMultiAdapter(
-                (self.context, self.request), name ="+archivesubscriptions")
+                (self.context, self.request), name="+archivesubscriptions")
 
     @stepthrough('+recipe')
     def traverse_recipe(self, name):
@@ -4488,7 +4488,7 @@
                 team_string = team_names[0]
             elif len(team_names) > 1:
                 verb = 'have been'
-                team_string= (
+                team_string = (
                     ', '.join(team_names[:-1]) + ' and ' + team_names[-1])
             full_message += '%s %s %s' % (team_string, verb, message)
         self.request.response.addInfoNotification(full_message)
@@ -4608,7 +4608,7 @@
                    title=_('These addresses are confirmed as being yours'),
                    source=SimpleVocabulary(terms),
                    ),
-            custom_widget = self.custom_widgets['VALIDATED_SELECTED'])
+            custom_widget=self.custom_widgets['VALIDATED_SELECTED'])
 
     def _unvalidated_emails_field(self):
         """Create a field with a vocabulary of unvalidated and guessed emails.
@@ -4630,7 +4630,7 @@
         return FormFields(
             Choice(__name__='UNVALIDATED_SELECTED', title=title,
                    source=SimpleVocabulary(terms)),
-            custom_widget = self.custom_widgets['UNVALIDATED_SELECTED'])
+            custom_widget=self.custom_widgets['UNVALIDATED_SELECTED'])
 
     def _mailing_list_subscription_type(self, mailing_list):
         """Return the context user's subscription type for the given list.

=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2011-04-15 15:08:20 +0000
+++ lib/lp/registry/model/distribution.py	2011-04-26 21:01:43 +0000
@@ -69,9 +69,7 @@
 from canonical.launchpad.interfaces.lpstorm import IStore
 from canonical.launchpad.webapp.url import urlparse
 from lp.answers.interfaces.faqtarget import IFAQTarget
-from lp.answers.interfaces.questioncollection import (
-    QUESTION_STATUS_DEFAULT_SEARCH,
-    )
+from lp.answers.enums import QUESTION_STATUS_DEFAULT_SEARCH
 from lp.answers.interfaces.questiontarget import IQuestionTarget
 from lp.answers.model.faq import (
     FAQ,
@@ -271,7 +269,7 @@
     translationpermission = EnumCol(
         dbName='translationpermission', notNull=True,
         schema=TranslationPermission, default=TranslationPermission.OPEN)
-    active = True # Required by IPillar interface.
+    active = True
     max_bug_heat = Int()
 
     def __repr__(self):
@@ -469,7 +467,7 @@
 
         if by_country and mirrors:
             # Since country data is needed, fetch countries into the cache.
-            countries = list(Store.of(self).find(
+            list(Store.of(self).find(
                 Country,
                 Country.id.is_in(mirror.countryID for mirror in mirrors)))
 
@@ -610,9 +608,9 @@
         # the bug is fixed.
         ret = Store.of(self).find(
             DistroSeries,
-            ParentDistroSeries.id==DistroSeries.parent_seriesID,
-            ParentDistroSeries.distributionID==self.id,
-            DistroSeries.distributionID!=self.id)
+            ParentDistroSeries.id == DistroSeries.parent_seriesID,
+            ParentDistroSeries.distributionID == self.id,
+            DistroSeries.distributionID != self.id)
         return ret.config(
             distinct=True).order_by(Desc(DistroSeries.date_created))
 
@@ -1545,7 +1543,6 @@
             clauses.append(
                 "Archive.private = FALSE AND Archive.enabled = TRUE")
 
-
         query = ' AND '.join(clauses)
         return Archive.select(
             query, orderBy=orderBy, clauseTables=clauseTables)
@@ -1875,10 +1872,12 @@
         distroseries task than any other.
         """
         distributionID = self.id
+
         def weight_function(bugtask):
             if bugtask.distributionID == distributionID:
                 return OrderedBugTask(1, bugtask.id, bugtask)
             return OrderedBugTask(2, bugtask.id, bugtask)
+
         return weight_function
 
 

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2011-04-12 23:25:45 +0000
+++ lib/lp/registry/model/product.py	2011-04-26 21:01:43 +0000
@@ -80,9 +80,7 @@
     )
 from canonical.lazr.utils import safe_hasattr
 from lp.answers.interfaces.faqtarget import IFAQTarget
-from lp.answers.interfaces.questioncollection import (
-    QUESTION_STATUS_DEFAULT_SEARCH,
-    )
+from lp.answers.enums import QUESTION_STATUS_DEFAULT_SEARCH
 from lp.answers.interfaces.questiontarget import IQuestionTarget
 from lp.answers.model.faq import (
     FAQ,
@@ -1343,10 +1341,12 @@
         any other.
         """
         productID = self.id
+
         def weight_function(bugtask):
             if bugtask.productID == productID:
                 return OrderedBugTask(1, bugtask.id, bugtask)
             return OrderedBugTask(2, bugtask.id, bugtask)
+
         return weight_function
 
 
@@ -1386,11 +1386,13 @@
             ).order_by(Desc(Product.datecreated))
         if not eager_load:
             return result
+
         def do_eager_load(rows):
             owner_ids = set(map(operator.attrgetter('_ownerID'), rows))
             # +detailed-listing renders the person with team branding.
             list(getUtility(IPersonSet).getPrecachedPersonsFromIDs(
                 owner_ids, need_validity=True, need_icon=True))
+
         return DecoratedResultSet(result, pre_iter_hook=do_eager_load)
 
     def get(self, productid):
@@ -1651,7 +1653,6 @@
 
     def search_sqlobject(self, text):
         """See `IProductSet`"""
-        clauseTables = ['Product']
         queries = ["Product.fti @@ ftq(%s) " % sqlvalues(text)]
         queries.append('Product.active IS TRUE')
         query = "Product.active IS TRUE AND Product.fti @@ ftq(%s)" \
@@ -1673,7 +1674,6 @@
             Person.id == Product._ownerID).config(
                 distinct=True).order_by(Product.title)
 
-
         # We only want Product - the other tables are just to populate
         # the cache.
         return DecoratedResultSet(results, operator.itemgetter(0))

=== modified file 'lib/lp/registry/model/projectgroup.py'
--- lib/lp/registry/model/projectgroup.py	2011-04-12 06:21:39 +0000
+++ lib/lp/registry/model/projectgroup.py	2011-04-26 21:01:43 +0000
@@ -43,10 +43,10 @@
     IHasMugshot,
     )
 from canonical.launchpad.webapp.authorization import check_permission
+from lp.answers.enums import QUESTION_STATUS_DEFAULT_SEARCH
 from lp.answers.interfaces.faqcollection import IFAQCollection
 from lp.answers.interfaces.questioncollection import (
     ISearchableByQuestionOwner,
-    QUESTION_STATUS_DEFAULT_SEARCH,
     )
 from lp.answers.model.faq import (
     FAQ,

=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2011-04-21 19:56:36 +0000
+++ lib/lp/registry/model/sourcepackage.py	2011-04-26 21:01:43 +0000
@@ -32,9 +32,7 @@
 from canonical.launchpad.interfaces.lpstorm import IStore
 from canonical.lazr.utils import smartquote
 from canonical.launchpad.webapp.interfaces import ILaunchBag
-from lp.answers.interfaces.questioncollection import (
-    QUESTION_STATUS_DEFAULT_SEARCH,
-    )
+from lp.answers.enums import QUESTION_STATUS_DEFAULT_SEARCH
 from lp.answers.interfaces.questiontarget import IQuestionTarget
 from lp.answers.model.question import (
     QuestionTargetMixin,

=== modified file 'scripts/close-account.py'
--- scripts/close-account.py	2010-11-08 12:52:43 +0000
+++ scripts/close-account.py	2011-04-26 21:01:43 +0000
@@ -15,7 +15,7 @@
 
 from canonical.database.sqlbase import connect, sqlvalues
 from canonical.launchpad.scripts import db_options, logger_options, logger
-from lp.answers.interfaces.questionenums import QuestionStatus
+from lp.answers.enums import QuestionStatus
 from lp.registry.interfaces.person import PersonCreationRationale