Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | slightly improve readme wording | Maximilian Hils | 2016-06-02 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1199 from dufferzafar/pathod-generator-hotfix | Thomas Kriechbaumer | 2016-06-02 | 1 | -0/+2 |
|\ | | | | | Handle the slice object case in TransformGenerator.__getitem__ | ||||
| * | Handle the slice object case in TransformGenerator.__getitem__ | Shadab Zafar | 2016-06-03 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #1198 from s4chin/add-install-instructions | Thomas Kriechbaumer | 2016-06-02 | 1 | -0/+7 |
|\ | | | | | Add installation section to README | ||||
| * | Update README | Sachin Kelkar | 2016-06-02 | 1 | -0/+7 |
| | | |||||
* | | web: use object spread operator | Maximilian Hils | 2016-06-02 | 3 | -501/+399 |
| | | | | | | | | | | While the spread operator is not part of ES6, React also uses it for JSX. It makes sense for us to keep it in other parts of the codebase as well. | ||||
* | | please flake8 | Maximilian Hils | 2016-06-02 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'duffer/pathod-lang-generators' | Maximilian Hils | 2016-06-02 | 3 | -31/+41 |
|\ \ | |/ |/| | |||||
| * | Simplify rand_byte by creating a special case for Python 2 | Shadab Zafar | 2016-06-02 | 1 | -1/+5 |
| | | |||||
| * | Enable Travis for test_language_generators | Shadab Zafar | 2016-06-02 | 1 | -2/+2 |
| | | |||||
| * | Remove redundant __getslice__ from TransformGenerator | Shadab Zafar | 2016-06-02 | 1 | -4/+0 |
| | | |||||
| * | Py3: Return bytes from FileGenerator | Shadab Zafar | 2016-06-02 | 2 | -9/+11 |
| | | | | | | | | and use __getitem__ instead of __getslice__ | ||||
| * | Py3: Return bytes from RandomGenerator | Shadab Zafar | 2016-06-02 | 2 | -16/+24 |
| | | | | | | | | and use __getitem__ rather than __getslice__ | ||||
* | | Move the admonision to use Discourse in the issue template to the bottom | Aldo Cortesi | 2016-06-02 | 1 | -1/+3 |
| | | | | | | | | | | | | Github integrations get the raw issue text, which means that the context we see in-channel is mostly the admonition. I think it's visible enough at the bottom to catch most users who would have paid attention to it if it were at the top. | ||||
* | | Merge pull request #1191 from cortesi/utils | Aldo Cortesi | 2016-06-02 | 23 | -298/+281 |
|\ \ | | | | | | | Utils reorganisation | ||||
| * | | Shift a bunch more string-related functions to strutils | Aldo Cortesi | 2016-06-02 | 9 | -87/+82 |
| | | | |||||
| * | | Consolidate some functions to strutils.bytes_to_escaped_str | Aldo Cortesi | 2016-06-02 | 4 | -29/+6 |
| | | | |||||
| * | | xrepr is used exactly once. move to pathoc.py. | Aldo Cortesi | 2016-06-02 | 2 | -5/+5 |
| | | | |||||
| * | | Utils reorganisation: add netlib.strutils | Aldo Cortesi | 2016-06-02 | 17 | -182/+193 |
|/ / | | | | | | | Extract a number of string and format-related functions to netlib.strutils. | ||||
* / | Fix non-deterministic test failures in export | Aldo Cortesi | 2016-06-02 | 3 | -18/+33 |
|/ | | | | | We had various places in the code where we relied on incidental order of dict keys. Add a helper to multidict, and fix. | ||||
* | Make Travis behave | Aldo Cortesi | 2016-06-01 | 1 | -1/+6 |
| | |||||
* | Ditch IRC Travis notifications, try to fix Slack Travis notifications | Aldo Cortesi | 2016-06-01 | 1 | -10/+1 |
| | |||||
* | Remove downloads for now | Aldo Cortesi | 2016-06-01 | 1 | -5/+1 |
| | | | | Fixes #1185 | ||||
* | Un-break mitmproxy console | Aldo Cortesi | 2016-06-01 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1183 from mitmproxy/module-imports | Aldo Cortesi | 2016-06-01 | 66 | -504/+618 |
|\ | | | | | use module-level imports only | ||||
| * | Fix test suite | Aldo Cortesi | 2016-06-01 | 3 | -12/+14 |
| | | |||||
| * | Fix lint harder | Aldo Cortesi | 2016-06-01 | 1 | -9/+9 |
| | | |||||
| * | Merge branch 'module-imports' of github.com:mitmproxy/mitmproxy into ↵ | Aldo Cortesi | 2016-06-01 | 2 | -18/+15 |
| |\ | | | | | | | | | | module-imports | ||||
| | * | fix imports | Maximilian Hils | 2016-05-31 | 2 | -16/+13 |
| | | | |||||
| | * | fix PIL import | Maximilian Hils | 2016-05-31 | 1 | -2/+2 |
| | | | |||||
| * | | Satisfy lint | Aldo Cortesi | 2016-06-01 | 5 | -6/+8 |
| |/ | |||||
| * | use module-level imports only | Maximilian Hils | 2016-05-31 | 66 | -488/+601 |
| | | |||||
* | | Merge pull request #1182 from cortesi/netlibimports | Maximilian Hils | 2016-05-31 | 21 | -170/+172 |
|\ \ | | | | | | | Reorganise netlib imports according to Google Style Guide | ||||
| * | | Reorganise netlib imports according to Google Style Guide | Aldo Cortesi | 2016-06-01 | 21 | -170/+172 |
| | | | |||||
* | | | It's text markup language, Jim, but not as we know it | Aldo Cortesi | 2016-06-01 | 1 | -3/+3 |
|/ / | |||||
* | | Merge remote-tracking branch 'upstream/master' | Aldo Cortesi | 2016-06-01 | 8 | -28/+29 |
|\ \ | |||||
| * \ | Merge pull request #1180 from dufferzafar/pathod-base | Maximilian Hils | 2016-05-31 | 3 | -14/+16 |
| |\ \ | | |/ | |/| | Python 3 - pathod.language.base | ||||
| | * | Py3: Use byte literals for comparison | Shadab Zafar | 2016-05-31 | 1 | -12/+12 |
| | | | |||||
| | * | Py3: Use six.string_types instead of basestring | Shadab Zafar | 2016-05-31 | 1 | -1/+2 |
| | | | |||||
| | * | Py3: Use range from six.moves | Shadab Zafar | 2016-05-31 | 1 | -1/+2 |
| | | | |||||
| * | | be more strict about module namespaces | Maximilian Hils | 2016-05-31 | 5 | -14/+13 |
| |/ | |||||
* | | Merge branch 'master' of github.com:cortesi/mitmproxy | Aldo Cortesi | 2016-06-01 | 45 | -614/+622 |
|\| | |||||
| * | Merge pull request #1179 from cortesi/reorg | Aldo Cortesi | 2016-05-31 | 45 | -604/+587 |
| |\ | | | | | | | Start reorganising */utils.py | ||||
| | * | Fix tests harder | Aldo Cortesi | 2016-05-31 | 1 | -2/+2 |
| | | | |||||
| | * | http2.frame -> http2.framereader | Aldo Cortesi | 2016-05-31 | 4 | -12/+12 |
| | | | |||||
| | * | Fix test failures | Aldo Cortesi | 2016-05-31 | 1 | -1/+1 |
| | | | |||||
| | * | Satisfy flake8 | Aldo Cortesi | 2016-05-31 | 9 | -2/+9 |
| | | | |||||
| | * | Unify and make symmetric pretty_size and parse_size | Aldo Cortesi | 2016-05-31 | 2 | -21/+24 |
| | | | |||||
| | * | Move human-friendly format functions to netlib.human, remove redundant ↵ | Aldo Cortesi | 2016-05-31 | 17 | -141/+110 |
| | | | | | | | | | | | | implementations | ||||
| | * | utils.multipartdecode -> http.multipart.decode | Aldo Cortesi | 2016-05-31 | 9 | -95/+101 |
| | | | | | | | | | | | | | | | | | | also utils.parse_content_type -> http.headers.parse_content_type |