Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into beautiful-json | Aldo Cortesi | 2016-06-08 | 9 | -39/+70 |
|\ | |||||
| * | Merge pull request #1226 from Kriechi/travis-tox | Aldo Cortesi | 2016-06-08 | 3 | -25/+38 |
| |\ | | | | | | | use tox in Travis | ||||
| | * | use tox in Travis | Thomas Kriechbaumer | 2016-06-07 | 3 | -25/+38 |
| |/ | |||||
| * | tests++ | Maximilian Hils | 2016-06-07 | 2 | -8/+24 |
| | | |||||
| * | disable codecov comments | Maximilian Hils | 2016-06-07 | 1 | -0/+1 |
| | | |||||
| * | don't declare codecov as dev dependency | Maximilian Hils | 2016-06-07 | 3 | -3/+2 |
| | | |||||
| * | use codecov pypi package | Maximilian Hils | 2016-06-07 | 3 | -2/+3 |
| | | |||||
| * | Update README.rst | Maximilian Hils | 2016-06-07 | 1 | -3/+3 |
| | | |||||
| * | Py3: Fix a test_language_writer test by using a byte literal | Shadab Zafar | 2016-06-07 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'port-pathod-language-writer' | Maximilian Hils | 2016-06-07 | 1 | -2/+2 |
| |\ | |||||
| | * | Reenable pathod.language.writer tests | Maximilian Hils | 2016-06-06 | 1 | -2/+2 |
| | | | | | | | | | | | | This reverts commit 1e1b4fd88dd16b3b6b8c2cbf9337cba4dffa6c68. | ||||
| * | | Merge pull request #1216 from dufferzafar/pathod-lang-ws | Maximilian Hils | 2016-06-06 | 2 | -3/+3 |
| |\ \ | | | | | | | | | Python 3 - pathod.language.websocket | ||||
| | * | | Enable Travis for test/pathod/test_language_websocket | Shadab Zafar | 2016-06-07 | 2 | -3/+3 |
| | | | | |||||
| * | | | add codecov too appveyor | Maximilian Hils | 2016-06-06 | 1 | -0/+2 |
| | | | | |||||
| * | | | s/coveralls/codecov/ | Maximilian Hils | 2016-06-06 | 2 | -2/+1 |
| |/ / | |||||
* | | | simplify pretty_json, improve test coverage | Maximilian Hils | 2016-06-06 | 2 | -10/+6 |
| | | | |||||
* | | | change content views: escape in raw mode, show utf8 in json | Maximilian Hils | 2016-06-06 | 1 | -2/+12 |
|/ / | |||||
* | | Utils cleanups | Aldo Cortesi | 2016-06-07 | 18 | -99/+90 |
| | | | | | | | | | | | | | | | | - Move more stuff that belongs in netlib.human - Move some stuff to near the only use - Zap mitmproxy.utils.timestamp(). I see the rationale, but we used it interchangeably with time.time() throughout the project. Since time.time() dominates in the codebase and timestamp() is such low utility, away it goes. | ||||
* | | fix docs | Maximilian Hils | 2016-06-06 | 1 | -1/+1 |
| | | |||||
* | | travis: stricter doc checks | Maximilian Hils | 2016-06-06 | 1 | -1/+1 |
| | | |||||
* | | docs: remove option directive | Maximilian Hils | 2016-06-06 | 18 | -54/+54 |
| | | | | | | | | | | inserting " .. option::" tags create ugly markup, so we just ditch this entirely and continue using refs. | ||||
* | | fix MultiView docs | Maximilian Hils | 2016-06-06 | 1 | -4/+10 |
| | | |||||
* | | minor fixes | Maximilian Hils | 2016-06-06 | 3 | -6/+6 |
| | | |||||
* | | docs: adjust theme override inclusion | Aldo Cortesi | 2016-06-07 | 1 | -5/+2 |
| | | | | | | | | https://github.com/rtfd/readthedocs.org/issues/2116 | ||||
* | | Merge remote-tracking branch 'upstream/master' | Aldo Cortesi | 2016-06-07 | 23 | -1539/+1600 |
|\ \ | |||||
| * | | fix all pathod tests on Windows :tada: | Maximilian Hils | 2016-06-06 | 1 | -14/+14 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-06-06 | 1 | -8/+4 |
| |\ \ | |||||
| | * | | web: accept all falsey sortFns in sortedIndexOf | Maximilian Hils | 2016-06-06 | 1 | -8/+4 |
| | | | | |||||
| * | | | Merge branch 'pathod-lang-http' | Maximilian Hils | 2016-06-06 | 9 | -108/+115 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | fix NestedMessage encoding | Maximilian Hils | 2016-06-06 | 2 | -2/+2 |
| | | | | |||||
| | * | | fix .freeze(), improve tests | Maximilian Hils | 2016-06-06 | 3 | -6/+11 |
| | | | | |||||
| | * | | update pyparsing | Maximilian Hils | 2016-06-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Py3: encode() status code responses | Shadab Zafar | 2016-06-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Py3: Exception doesn't have to be bytes | Shadab Zafar | 2016-06-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Py3: Fix status_code and other tests by using byte literals | Shadab Zafar | 2016-06-06 | 1 | -7/+7 |
| | | | | |||||
| | * | | Py3: Fix corresponding base.Integer test in test_language_base | Shadab Zafar | 2016-06-06 | 2 | -2/+2 |
| | | | | |||||
| | * | | Py3: Store base.Integer value as bytes | Shadab Zafar | 2016-06-06 | 1 | -2/+2 |
| | | | | |||||
| | * | | Py3: Fix useragent tests | Shadab Zafar | 2016-06-06 | 1 | -4/+4 |
| | | | | |||||
| | * | | Py3: UASTRINGS should be indexed by and return bytes | Shadab Zafar | 2016-06-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Py3: decode() input before creating new Header token | Shadab Zafar | 2016-06-06 | 1 | -4/+4 |
| | | | | |||||
| | * | | Py3: Fix websocket tests | Shadab Zafar | 2016-06-06 | 1 | -10/+10 |
| | | | | |||||
| | * | | Py3: Use BytesIO in tutils.render | Shadab Zafar | 2016-06-06 | 1 | -1/+2 |
| | | | | |||||
| | * | | Py3: Use bytes_to_escaped_str for escaping message | Shadab Zafar | 2016-06-06 | 1 | -3/+4 |
| | | | | |||||
| | * | | Py3: More byte literals | Shadab Zafar | 2016-06-06 | 1 | -6/+6 |
| | | | | |||||
| | * | | Enable Travis for test/pathod/test_language_http | Shadab Zafar | 2016-06-06 | 2 | -3/+3 |
| | | | | |||||
| | * | | Py3: Use byte string literals | Shadab Zafar | 2016-06-06 | 2 | -24/+24 |
| | | | | |||||
| | * | | Py3: Use BytesIO instead of StringIO for tests | Shadab Zafar | 2016-06-06 | 1 | -8/+8 |
| | | | | |||||
| | * | | Py3: Use global next() instead of iterator method | Shadab Zafar | 2016-06-06 | 1 | -23/+23 |
| | | | | |||||
| | * | | Py3: Return bytes from _Component class | Shadab Zafar | 2016-06-06 | 1 | -3/+3 |
| | | | | |||||
| * | | | netlib: always disconnect when using context manager | Maximilian Hils | 2016-06-06 | 1 | -2/+4 |
| |/ / |