Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Flake8 and fix bug in phabricator
......................................................................


Flake8 and fix bug in phabricator

Change-Id: I7d79ec8a38048f727cdb56f85750848f278be745
---
M modules/phabricator/files/phab_epipe.py
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/phabricator/files/phab_epipe.py 
b/modules/phabricator/files/phab_epipe.py
index 1f656db..69a2fed 100644
--- a/modules/phabricator/files/phab_epipe.py
+++ b/modules/phabricator/files/phab_epipe.py
@@ -41,7 +41,6 @@
     host        = <phab_host>
 
 """
-import base64
 import os
 import re
 import subprocess
@@ -276,8 +275,8 @@
                         else:
                             err = 'Unknown email body format: from %s to %s'
                             dest = str(dest_addresses)
-                            raise EmailParsingError(error % (src_address,
-                                                             dest))
+                            raise EmailParsingError(err % (src_address,
+                                                           dest))
 
                 else:
                     log('attaching file')
@@ -393,7 +392,6 @@
         # email parsing logic.
         userinfo = phab.user.query(emails=[src_addy])
         if userinfo.response:
-            from email.mime.image import MIMEImage
             from email.mime.multipart import MIMEMultipart
             from email.mime.text import MIMEText
             body += "\n\n#%s" % (address_routing[route_address],)

-- 
To view, visit https://gerrit.wikimedia.org/r/278754
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d79ec8a38048f727cdb56f85750848f278be745
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ladsgroup <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to