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 |
|
Thomas Kriechbaumer
|
d76e5ad1ee
|
raise a more verbose error
|
2016-05-29 19:28:59 +02:00 |
|
Thomas Kriechbaumer
|
a0e4bba7aa
|
more style cleanup
|
2016-05-29 15:13:08 +02:00 |
|
Thomas Kriechbaumer
|
01fcaa64c3
|
fix #1162
|
2016-05-29 13:58:14 +02:00 |
|
Thomas Kriechbaumer
|
e2447406cc
|
more style cleanup
|
2016-05-29 13:43:20 +02:00 |
|
Thomas Kriechbaumer
|
5c45ca7f9a
|
fix travis with flake8
|
2016-05-29 12:17:46 +02:00 |
|
Thomas Kriechbaumer
|
287eff804d
|
install flake8
|
2016-05-29 12:03:29 +02:00 |
|
Thomas Kriechbaumer
|
8eeab37a07
|
more style cleanup
Use this to check:
flake8 --count mitmproxy netlib pathod examples test
|
2016-05-29 11:55:12 +02:00 |
|
Thomas Kriechbaumer
|
0c2c017727
|
change comment indentation
|
2016-05-29 11:04:55 +02:00 |
|
Thomas Kriechbaumer
|
c707479bcd
|
Merge pull request #1173 from mitmproxy/format-examples
Format examples
|
2016-05-29 11:03:54 +02:00 |
|
Thomas Kriechbaumer
|
979c7fc319
|
Merge pull request #1174 from Kriechi/flake8
make sure we do not introduce more style offenses
|
2016-05-29 11:03:30 +02:00 |
|
Maximilian Hils
|
4544e0f337
|
fix docs typo
|
2016-05-29 02:00:30 -07:00 |
|
Aldo Cortesi
|
27fff86cf7
|
Update method names in /examples/flowbasic
Please enter the commit message for your changes. Lines starting
|
2016-05-29 20:51:30 +12:00 |
|
Thomas Kriechbaumer
|
93a7d5b186
|
make sure we do not introduce more style offenses
|
2016-05-29 10:51:21 +02:00 |
|
Maximilian Hils
|
17382b963e
|
format examples
|
2016-05-29 01:23:39 -07:00 |
|
Aldo Cortesi
|
6c8ad6d894
|
controller.ControlError -> exceptions.ControlException
|
2016-05-29 20:22:30 +12:00 |
|
Aldo Cortesi
|
8638000cfa
|
Add some comments to controller wrapper.
|
2016-05-29 20:17:35 +12:00 |
|
Aldo Cortesi
|
f3bee6f245
|
Merge pull request #1172 from cortesi/solidcore
First steps to solidifying the core
|
2016-05-29 20:03:40 +12:00 |
|
Maximilian Hils
|
85aa5da6e3
|
fix tests
|
2016-05-28 19:31:43 -07:00 |
|
Maximilian Hils
|
b70663f434
|
minor improvements
|
2016-05-28 19:10:49 -07:00 |
|
Aldo Cortesi
|
0176f50e4f
|
Adapt examples
|
2016-05-29 12:54:52 +12:00 |
|
Aldo Cortesi
|
0a875421c5
|
handle_* -> *
Now that we have the controller.handler decorator, the _handler prefix
stutters.
|
2016-05-29 12:49:01 +12:00 |
|
Aldo Cortesi
|
8bb9285678
|
Explicitly list all events
|
2016-05-29 12:15:52 +12:00 |
|
Aldo Cortesi
|
9a32402a39
|
Merge branch 'solidcore' of github.com:cortesi/mitmproxy into solidcore
|
2016-05-29 12:02:16 +12:00 |
|
Aldo Cortesi
|
e4f043f69c
|
Flatten ServerMaster into Master
|
2016-05-29 12:01:46 +12:00 |
|
Aldo Cortesi
|
ed415877d4
|
Merge branch 'master' into solidcore
|
2016-05-29 11:14:46 +12:00 |
|
Thomas Kriechbaumer
|
7971dce223
|
mitmproxy: fix most flake8 offenses
|
2016-05-28 22:45:15 +02:00 |
|
Thomas Kriechbaumer
|
e4045dc7f8
|
pathod: fix most flake8 offenses
|
2016-05-28 22:44:28 +02:00 |
|
Thomas Kriechbaumer
|
e5038c9ab7
|
netlib: fix most flake8 offenses
|
2016-05-28 22:17:02 +02:00 |
|
Thomas Kriechbaumer
|
e1cc91900f
|
ignore sslkeylogfile.log
|
2016-05-28 22:16:35 +02:00 |
|
Thomas Kriechbaumer
|
caee1adeb6
|
cleanup imports with flake8
|
2016-05-28 14:43:32 +02:00 |
|
Aldo Cortesi
|
4632cb5dbd
|
Merge branch 'master' into solidcore
|
2016-05-28 20:59:51 +12:00 |
|
Maximilian Hils
|
fa7964988f
|
fix Python 2 tests
|
2016-05-28 00:17:57 -07:00 |
|
Shadab Zafar
|
877f5c54ef
|
Enable Travis for test_log
|
2016-05-28 00:17:57 -07:00 |
|
Shadab Zafar
|
b71ef054b5
|
Py3: Use cStringIO from six.moves
|
2016-05-28 00:17:57 -07:00 |
|
Aldo Cortesi
|
0042653498
|
Be stricter about the handler call signature
Uses this to catch an error in mitmweb
|
2016-05-28 13:21:07 +12:00 |
|
Aldo Cortesi
|
735bbe52e1
|
Merge branch 'master' into solidcore
|
2016-05-28 13:09:35 +12:00 |
|
Aldo Cortesi
|
3a9e03ea1e
|
Fix crash in mitmproxy when viewing responses
|
2016-05-28 13:04:34 +12:00 |
|
Aldo Cortesi
|
804e04ef43
|
Zap stray debugging call
|
2016-05-28 12:47:26 +12:00 |
|
Aldo Cortesi
|
c6caafe365
|
Merge branch 'solidcore' of github.com:cortesi/mitmproxy into solidcore
|
2016-05-28 12:43:38 +12:00 |
|
Aldo Cortesi
|
f4813d5649
|
Make @controller.handler inheritance-friendly
Use this to adapt mitmweb and mitproxy console
|
2016-05-28 12:38:07 +12:00 |
|