Allow semicolons on end of media type

Also remove bad import from tcp/direction.py
andrewf · Jul 12, 2012 · 6fc5c31 · 6fc5c31
1 parent 91070a7
commit 6fc5c31
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mediatype.py b/mediatype.py
@@ -15,7 +15,7 @@ class MediaType(object):
     # of string as the types above, values are pretty much anything but another
     # semicolon
     mediatype_re = re.compile(
-        r'^([\w\-+.]+)/([\w\-+.]+)((?:\s*;\s*[\w\-]+=[^;]+)*)\s*$'
+        r'^([\w\-+.]+)/([\w\-+.]+)((?:\s*;\s*[\w\-]+=[^;]+)*);?\s*$'
     )
     # RE for parsing name-value pairs
     nvpair_re = re.compile(r'^\s*([\w\-]+)=([^;\s]+)\s*$')

diff --git a/tcp/direction.py b/tcp/direction.py
@@ -2,7 +2,7 @@
 import chunk as tcp
 from operator import itemgetter, attrgetter
 import logging as log
-from pcap2har import settings
+import settings
 import packet
 import logging