100% coverage for IMAP4Server wire protocol parsing.

rdaysky · Jul 22, 2017 · d9138df · d9138df
1 parent 0008298
commit d9138df
Show file tree

Hide file tree

Showing 2 changed files with 655 additions and 6 deletions.
diff --git a/src/twisted/mail/imap4.py b/src/twisted/mail/imap4.py
@@ -896,7 +896,8 @@ def arg_astring(self, line, final=False):
             try:
                 size = int(line[1:-1])
             except ValueError:
-                raise IllegalClientResponse("Bad literal size: " + line[1:-1])
+                raise IllegalClientResponse(
+                    "Bad literal size: " + repr(line[1:-1]))
             if final and not size:
                 return (b'', b'')
             d = self._stringLiteral(size)
@@ -1048,7 +1049,7 @@ def opt_datetime(self, line):
         if line.startswith(b'"'):
             try:
                 spam, date, rest = line.split(b'"',2)
-            except IndexError:
+            except ValueError:
                 raise IllegalClientResponse("Malformed date-time")
             return (date, rest[1:])
         else:
@@ -1064,7 +1065,7 @@ def opt_charset(self, line):
             if len(arg) == 1:
                 raise IllegalClientResponse("Missing charset identifier")
             if len(arg) == 2:
-                arg.append('')
+                arg.append(b'')
             spam, arg, rest = arg
             return (arg, rest)
         else: