diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-07-31 22:29:13 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-07-31 22:29:13 +0200 |
| commit | e9401a2123f416f8dd4c24bb4bbc74f297369133 (patch) | |
| tree | afebf68d1091d487ef64083962992ea7b703a80e /libmproxy/controller.py | |
| parent | f5fb1138fdda77ec4a3bb5493479d2f56cdb0851 (diff) | |
| parent | 3e3dbee936bb71e813d50937118eebff4ba23617 (diff) | |
| download | mitmproxy-e9401a2123f416f8dd4c24bb4bbc74f297369133.tar.gz mitmproxy-e9401a2123f416f8dd4c24bb4bbc74f297369133.tar.bz2 mitmproxy-e9401a2123f416f8dd4c24bb4bbc74f297369133.zip | |
Merge branch 'stream'
Conflicts:
libmproxy/protocol/http.py
Diffstat (limited to 'libmproxy/controller.py')
| -rw-r--r-- | libmproxy/controller.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/controller.py b/libmproxy/controller.py index 63e44241..4a72cf80 100644 --- a/libmproxy/controller.py +++ b/libmproxy/controller.py @@ -49,7 +49,7 @@ class Channel: try: # The timeout is here so we can handle a should_exit event. g = m.reply.q.get(timeout=0.5) - except Queue.Empty: # pragma: nocover + except Queue.Empty: # pragma: nocover continue return g |