X-Git-Url: https://git.ozlabs.org/?p=patchwork;a=blobdiff_plain;f=patchwork%2Fviews%2F__init__.py;h=8df8920ce991f104a0e783b69c46ba861272770a;hp=b64f6041eca006bb800f190c0b2183f5e9b3c3ac;hb=ed3250d636b024973f527899ee6bc7210ccfb5b4;hpb=ea1baeefb09236cfbf30ce35a2d67d601e3ff69f

diff --git a/patchwork/views/__init__.py b/patchwork/views/__init__.py
index b64f604..8df8920 100644
--- a/patchwork/views/__init__.py
+++ b/patchwork/views/__init__.py
@@ -26,20 +26,11 @@ from patchwork.models import Comment
 import re
 import datetime
 
-try:
-    from email.mime.nonmultipart import MIMENonMultipart
-    from email.encoders import encode_7or8bit
-    from email.parser import HeaderParser
-    from email.header import Header
-    import email.utils
-except ImportError:
-    # Python 2.4 compatibility
-    from email.MIMENonMultipart import MIMENonMultipart
-    from email.Encoders import encode_7or8bit
-    from email.Parser import HeaderParser
-    from email.Header import Header
-    import email.Utils
-    email.utils = email.Utils
+from email.mime.nonmultipart import MIMENonMultipart
+from email.encoders import encode_7or8bit
+from email.parser import HeaderParser
+from email.header import Header
+import email.utils
 
 def generic_list(request, project, view,
         view_args = {}, filter_settings = [], patches = None,