Aldo Cortesi
d60fdebc47
Fix lint harder
2016-06-01 14:50:06 +12:00
Aldo Cortesi
efbdd8d266
Merge branch 'module-imports' of github.com:mitmproxy/mitmproxy into module-imports
2016-06-01 14:43:24 +12:00
Aldo Cortesi
afcfa783ea
Satisfy lint
2016-06-01 14:43:08 +12:00
Maximilian Hils
1ca45b1e64
fix imports
2016-05-31 19:35:10 -07:00
Maximilian Hils
3aa8d42b05
fix PIL import
2016-05-31 19:25:47 -07:00
Maximilian Hils
0a2e7a97cd
use module-level imports only
2016-05-31 19:06:57 -07:00
Maximilian Hils
1dd078beb2
Merge pull request #1182 from cortesi/netlibimports
...
Reorganise netlib imports according to Google Style Guide
2016-05-31 17:33:57 -07:00
Aldo Cortesi
44fdcb4b82
Reorganise netlib imports according to Google Style Guide
2016-06-01 11:12:10 +12:00
Aldo Cortesi
ebeda5e8d2
It's text markup language, Jim, but not as we know it
2016-06-01 10:17:10 +12:00
Aldo Cortesi
be64445364
Merge remote-tracking branch 'upstream/master'
2016-06-01 09:58:15 +12:00
Aldo Cortesi
a061e45877
Merge branch 'master' of github.com:cortesi/mitmproxy
2016-06-01 09:58:01 +12:00
Aldo Cortesi
0670354203
Style guides in README
2016-06-01 09:55:43 +12:00
Maximilian Hils
898602ad21
Merge pull request #1180 from dufferzafar/pathod-base
...
Python 3 - pathod.language.base
2016-05-31 14:46:28 -07:00
Maximilian Hils
30fff1fb32
be more strict about module namespaces
2016-05-31 14:05:57 -07:00
Aldo Cortesi
a7abf8b731
Merge pull request #1179 from cortesi/reorg
...
Start reorganising */utils.py
2016-05-31 21:03:42 +12:00
Aldo Cortesi
4da125b6a0
Fix tests harder
2016-05-31 20:51:06 +12:00
Aldo Cortesi
42e91fcfe1
http2.frame -> http2.framereader
2016-05-31 20:32:28 +12:00
Aldo Cortesi
5a75ea3fc6
Fix test failures
2016-05-31 20:19:54 +12:00
Aldo Cortesi
40a030f215
Satisfy flake8
2016-05-31 19:58:28 +12:00
Aldo Cortesi
f62efed304
Unify and make symmetric pretty_size and parse_size
2016-05-31 19:45:48 +12:00
Aldo Cortesi
b2f63458fc
Move human-friendly format functions to netlib.human, remove redundant implementations
2016-05-31 19:32:08 +12:00
Aldo Cortesi
ec34cae618
utils.multipartdecode -> http.multipart.decode
...
also
utils.parse_content_type -> http.headers.parse_content_type
2016-05-31 19:07:55 +12:00
Aldo Cortesi
15b2374ef9
netlib.utils.get_header_tokens -> netlib.http1.read.get_header_tokens
...
Placing this next to its only use.
2016-05-31 18:54:42 +12:00
Aldo Cortesi
da074bff01
isascii is unused
2016-05-31 18:51:40 +12:00
Aldo Cortesi
6dda2b2ee5
Module is part of the name - url.decode, not url.urldecode
...
A pattern we need to use far more often in the codebase
2016-05-31 18:46:19 +12:00
Aldo Cortesi
4e6c9c4e93
Extract url functions from netlib.utils and move to netlib.http.url
2016-05-31 18:42:56 +12:00
Aldo Cortesi
08fbe6f111
Start cleaning up netlib.utils
...
- Remove http2 functions, move to http2.frame
- Remove Serializable, move to netlib.basetypes
2016-05-31 17:16:31 +12:00
Aldo Cortesi
2f526393d2
Merge pull request #1178 from cortesi/pseudohdrs
...
Improve handling of HTTP2 pseudo-headers
2016-05-31 16:34:28 +12:00
Aldo Cortesi
4de4223b2d
Extend pseudo-header treatment to :status on responses
2016-05-31 15:12:20 +12:00
Aldo Cortesi
9ea68ebd28
Improve handling of pseudo-headers
...
- The canonical source for :method, :scheme and :path are the .method, .scheme
and .path attributes on the request object.
- These pseudo-headers are stripped after reading the request, and re-inserted
just before sending.
- The :authority header remains, and should be handled analagously to the Host
header in HTTP1 with respect to display and user interaction.
2016-05-31 14:36:17 +12:00
Aldo Cortesi
d98582664d
Make tox run all tests for 2.7
2016-05-31 10:25:24 +12:00
Aldo Cortesi
bc6509ab6d
Fix test import error
2016-05-31 10:25:02 +12:00
Aldo Cortesi
3e8345ee93
Merge branch 'flow-module-2' of https://github.com/mhils/mitmproxy into mhils-flow-module-2
2016-05-31 09:45:37 +12:00
Shadab Zafar
25e30f42be
Py3: Use byte literals for comparison
2016-05-31 01:13:50 +05:30
Shadab Zafar
42f16d5d40
Py3: Use six.string_types instead of basestring
2016-05-31 00:49:44 +05:30
Shadab Zafar
769e20f2a9
Py3: Use range from six.moves
2016-05-31 00:41:44 +05:30
Maximilian Hils
e3d7224e5d
tell flake8 that type-annotation imports are okay
2016-05-30 02:53:58 -07:00
Maximilian Hils
89f07603ca
split mitmproxy.flow into mitmproxy.flow.*
2016-05-30 01:40:09 -07:00
Thomas Kriechbaumer
4f0657bc22
activate flake8 for good!
2016-05-30 09:44:40 +02:00
Clemens Brunner
6652e3a369
start of developing server side for options ( #1155 )
...
* added UI for options menu
* update UI for options menu
* update UI for options v2
* update UI for options v2
* added new btn class
* little changes
* little changes
* merge
* deleted branch
* change menu button class
* added option route + added very incomplete handler class
* moved options to settings
* added toggleinputbutton
* changed options menu
* added option for stream large bodies, but no working
* added option for stream large bodies, but no working
2016-05-29 23:34:30 -07:00
Aldo Cortesi
e8290a0eb4
Satisfy flake8
2016-05-30 12:41:44 +12:00
Aldo Cortesi
6ecc6da486
Merge branch 'tox' of https://github.com/Kriechi/mitmproxy into Kriechi-tox
2016-05-30 12:20:46 +12:00
Thomas Kriechbaumer
be9438b01c
fix
2016-05-29 22:58:56 +02:00
Thomas Kriechbaumer
8cd0c9c330
fix windows paths
2016-05-29 22:47:51 +02:00
Thomas Kriechbaumer
669976d579
add tox
2016-05-29 22:39:06 +02:00
Thomas Kriechbaumer
fb0b591242
fix har test
2016-05-29 22:30:15 +02:00
Thomas Kriechbaumer
e723c2d6ad
fix bytes vs. str
2016-05-29 22:17:45 +02:00
Thomas Kriechbaumer
03167d5e71
fix headers order
2016-05-29 22:07:22 +02:00
Maximilian Hils
2e633af5aa
handle_* -> * leftovers
2016-05-29 13:01:45 -07:00
Thomas Kriechbaumer
748cbaa074
cleanup
2016-05-29 20:09:53 +02:00
