diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-02-02 18:12:02 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-02-02 18:12:02 +0100 |
| commit | 5b18a355aa96aae5e793845800042feac352ff08 (patch) | |
| tree | d3e1a307e92eded640d5ab375b802e996c92c46d | |
| parent | 83bd7b260383d06ca90d7a4268b19fa76f622bbc (diff) | |
| parent | 329710e6fbea712c4700ab64d7b8944a4bf717d7 (diff) | |
| download | mitmproxy-5b18a355aa96aae5e793845800042feac352ff08.tar.gz mitmproxy-5b18a355aa96aae5e793845800042feac352ff08.tar.bz2 mitmproxy-5b18a355aa96aae5e793845800042feac352ff08.zip | |
Merge pull request #909 from chrishamant/master
fix crash with viewing unpacked date objects
| -rw-r--r-- | libmproxy/contentviews.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libmproxy/contentviews.py b/libmproxy/contentviews.py index 526f5ff4..80955b0f 100644 --- a/libmproxy/contentviews.py +++ b/libmproxy/contentviews.py @@ -19,6 +19,7 @@ import subprocess import sys import lxml.html import lxml.etree +import datetime from PIL import Image from PIL.ExifTags import TAGS import html2text @@ -315,6 +316,8 @@ if pyamf: return b elif isinstance(b, list): return [self.unpack(i) for i in b] + elif isinstance(b, datetime.datetime): + return str(b) elif isinstance(b, flex.ArrayCollection): return [self.unpack(i, seen) for i in b] else: |