Aldo Cortesi
69de78515d
Make last_log actually return last log
2016-06-02 19:45:18 +12:00
Aldo Cortesi
c9dd574f48
Silence requests warnings
...
Once we convert the rest of the suite to pathoc, this can go.
2016-06-02 19:40:39 +12:00
Aldo Cortesi
d8c52964c7
Reimplement test retrievals on pathoc and ditch requests
...
Requests uses urllib3, which has a connection pool that's not easy to disable
(https://github.com/shazow/urllib3/issues/383 ).
2016-06-02 19:36:02 +12:00
Aldo Cortesi
a7522d9308
pathod.test shouldn't use the API at all
2016-06-02 18:27:51 +12:00
Aldo Cortesi
254614e9f7
Since we have locks over the logs, use direct access rather than API requests to get to them
2016-06-02 18:10:36 +12:00
Aldo Cortesi
40156ce123
Bump error timeout
2016-06-02 17:55:11 +12:00
Aldo Cortesi
5e12384486
Remove debug print
2016-06-02 17:54:34 +12:00
Aldo Cortesi
92decf96dd
Add expect_log to the pathod test truss, and use it for last_log
2016-06-02 17:46:37 +12:00
Aldo Cortesi
14d6e1d2e3
Formatting of README
...
This is really a pretext to get Travis to rebuild, because it's stuck on the
wrong commit for the branch.
2016-06-02 16:43:46 +12:00
Aldo Cortesi
29bcdc8250
Fix lock over pathod locks
...
There were basically a nop before... o_O
2016-06-02 16:08:17 +12:00
Aldo Cortesi
ffca395e48
Honesty in testing
...
- Don't skip tests that fail
- Don't omit console from coverage
I'm working on the pathod races, and can't seem to reproduce the failures
locally.
Also, let's not kid ourselves about the console coverage - it should be
tracked. To improve it, we should measure it. Regressions in coverage of the
module should be flagged by CI.
2016-06-02 14:44:06 +12:00
Aldo Cortesi
07f7905f91
Merge pull request #1191 from cortesi/utils
...
Utils reorganisation
2016-06-02 13:14:56 +12:00
Aldo Cortesi
09da1febbd
Shift a bunch more string-related functions to strutils
2016-06-02 13:04:19 +12:00
Aldo Cortesi
31012d782f
Consolidate some functions to strutils.bytes_to_escaped_str
2016-06-02 12:53:12 +12:00
Aldo Cortesi
3d9dbd6a49
xrepr is used exactly once. move to pathoc.py.
2016-06-02 12:37:24 +12:00
Aldo Cortesi
cccdc98426
Utils reorganisation: add netlib.strutils
...
Extract a number of string and format-related functions to netlib.strutils.
2016-06-02 12:31:41 +12:00
Aldo Cortesi
eaa3b308f7
Fix non-deterministic test failures in export
...
We had various places in the code where we relied on incidental order of dict
keys. Add a helper to multidict, and fix.
2016-06-02 11:37:18 +12:00
Aldo Cortesi
92cdca50c7
Make Travis behave
2016-06-01 17:45:03 +12:00
Aldo Cortesi
08c82804e6
Ditch IRC Travis notifications, try to fix Slack Travis notifications
2016-06-01 17:26:55 +12:00
Aldo Cortesi
3206a48ceb
Remove downloads for now
...
Fixes #1185
2016-06-01 17:07:15 +12:00
Aldo Cortesi
1a08048a8d
Un-break mitmproxy console
2016-06-01 16:51:17 +12:00
Aldo Cortesi
92b24c6653
Merge pull request #1183 from mitmproxy/module-imports
...
use module-level imports only
2016-06-01 16:26:55 +12:00
Aldo Cortesi
137ee28bd6
Fix test suite
2016-06-01 15:10:54 +12:00
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
