Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 18:31:22 +00:00
Code Issues Projects Releases Wiki Activity
4,342 Commits 1 Branch 67 Tags 50 MiB
40156ce123
Commit Graph

4342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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