launchpad-reviewers team mailing list archive

[Deryck Hodge <deryck.hodge@xxxxxxxxxxxxx>]

Deryck Hodge has proposed merging lp:~deryck/launchpad/revert-r12017 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #683672 Bug description in verbose footer should be indented by 2 spaces
  https://bugs.launchpad.net/bugs/683672


Revert r12017 of devel.
-- 
https://code.launchpad.net/~deryck/launchpad/revert-r12017/+merge/42861
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~deryck/launchpad/revert-r12017 into lp:launchpad.

=== modified file 'lib/canonical/launchpad/emailtemplates/bug-notification-verbose.txt'
--- lib/canonical/launchpad/emailtemplates/bug-notification-verbose.txt	2010-12-02 13:20:05 +0000
+++ lib/canonical/launchpad/emailtemplates/bug-notification-verbose.txt	2010-12-06 17:48:55 +0000
@@ -5,11 +5,11 @@
 %(bug_url)s
 
 Title:
-%(bug_title)s
+  %(bug_title)s
 
 %(bug_statuses)s
 
 Bug description:
-%(bug_description)s
+  %(bug_description)s
 
 %(unsubscribe_notice)s

=== modified file 'lib/canonical/launchpad/emailtemplates/bug-notification.txt'
--- lib/canonical/launchpad/emailtemplates/bug-notification.txt	2010-12-02 13:20:05 +0000
+++ lib/canonical/launchpad/emailtemplates/bug-notification.txt	2010-12-06 17:48:55 +0000
@@ -5,4 +5,4 @@
 %(bug_url)s
 
 Title:
-%(bug_title)s
+  %(bug_title)s

=== modified file 'lib/lp/bugs/doc/bugnotification-sending.txt'
--- lib/lp/bugs/doc/bugnotification-sending.txt	2010-12-02 13:20:05 +0000
+++ lib/lp/bugs/doc/bugnotification-sending.txt	2010-12-06 17:48:55 +0000
@@ -872,13 +872,8 @@
 
     >>> switch_db_to_launchpad()
     >>> bug = factory.makeBug(
-    ...     product=factory.makeProduct(title='Foo'),
-    ...     title='In the beginning, the universe was created. This '
-    ...         'has made a lot of people very angry and has been '
-    ...         'widely regarded as a bad move',
-    ...     description="This is a long description of the bug, which "
-    ...         "will be automatically wrapped by the BugNotification "
-    ...         "machinery. Ain't technology great?")
+    ...     product=factory.makeProduct(title='Foo'), title='Foo is broken',
+    ...     description='desc')
 
     >>> verbose_person = factory.makePerson(
     ...     displayname='Verbose Person', email='verbose@xxxxxxxxxxx')
@@ -989,7 +984,7 @@
     http://bugs.launchpad.dev/bugs/...
     <BLANKLINE>
     Title:
-      In the beginning...
+      Foo is broken
     <BLANKLINE>
     ----------------------------------------------------------------------
 
@@ -1010,7 +1005,7 @@
     http://bugs.launchpad.dev/bugs/...
     <BLANKLINE>
     Title:
-      In the beginning...
+      Foo is broken
     <BLANKLINE>
     ----------------------------------------------------------------------
 
@@ -1030,15 +1025,13 @@
     http://bugs.launchpad.dev/bugs/...
     <BLANKLINE>
     Title:
-      In the beginning...
+      Foo is broken
     <BLANKLINE>
     Status in Foo:
       New
     <BLANKLINE>
     Bug description:
-       This is a long description of the bug, which
-       will be automatically wrapped by the BugNotification
-       machinery. Ain't technology great?
+      desc
     <BLANKLINE>
     To unsubscribe from this bug, go to:
     http://bugs.launchpad.dev/.../+bug/.../+subscribe
@@ -1061,44 +1054,16 @@
     http://bugs.launchpad.dev/bugs/...
     <BLANKLINE>
     Title:
-      In the beginning...
+      Foo is broken
     <BLANKLINE>
     Status in Foo:
       New
     <BLANKLINE>
     Bug description:
-       This is a long description of the bug, which
-       will be automatically wrapped by the BugNotification
-       machinery. Ain't technology great?
+      desc
     <BLANKLINE>
     ----------------------------------------------------------------------
 
-It's important to note that the bug title and description are wrapped
-and indented correctly in verbose notifications.
-
-    >>> message = collated_messages['conciseteam@xxxxxxxxxxx'][0]
-    >>> payload = message.get_payload(decode=True)
-    >>> print payload.split('\n')
-    [...
-     'Title:',
-     '  In the beginning, the universe was created. This has made a lot of',
-     '  people very angry and has been widely regarded as a bad move',
-     ...
-     'Bug description:',
-     '  This is a long description of the bug, which will be automatically',
-     "  wrapped by the BugNotification machinery. Ain't technology great?",
-    ...
-
-The title is also wrapped and indented in normal notifications.
-
-    >>> message = collated_messages['verboseteam@xxxxxxxxxxx'][0]
-    >>> payload = message.get_payload(decode=True)
-    >>> print payload.split('\n')
-    [...
-     'Title:',
-     '  In the beginning, the universe was created. This has made a lot of',
-     '  people very angry and has been widely regarded as a bad move',
-     '']
 
 Notification Recipients
 -----------------------

=== modified file 'lib/lp/bugs/scripts/bugnotification.py'
--- lib/lp/bugs/scripts/bugnotification.py	2010-12-02 13:20:05 +0000
+++ lib/lp/bugs/scripts/bugnotification.py	2010-12-06 17:48:55 +0000
@@ -119,10 +119,9 @@
         else:
             unsubscribe_notice = ''
 
-        data_wrapper = MailWrapper(width=72, indent='  ')
         body_data = {
             'content': mail_wrapper.format(content),
-            'bug_title': data_wrapper.format(bug.title),
+            'bug_title': bug.title,
             'bug_url': canonical_url(bug),
             'unsubscribe_notice': unsubscribe_notice,
             'notification_rationale': mail_wrapper.format(reason)}
@@ -132,8 +131,7 @@
         # footer.
         if email_person.verbose_bugnotifications:
             email_template = 'bug-notification-verbose.txt'
-            body_data['bug_description'] = data_wrapper.format(
-                bug.description)
+            body_data['bug_description'] = bug.description
 
             status_base = "Status in %s:\n  %s"
             status_strings = []