aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* slightly improve readme wordingMaximilian Hils2016-06-021-1/+1
|
* Merge pull request #1199 from dufferzafar/pathod-generator-hotfixThomas Kriechbaumer2016-06-021-0/+2
|\ | | | | Handle the slice object case in TransformGenerator.__getitem__
| * Handle the slice object case in TransformGenerator.__getitem__Shadab Zafar2016-06-031-0/+2
|/
* Merge pull request #1198 from s4chin/add-install-instructionsThomas Kriechbaumer2016-06-021-0/+7
|\ | | | | Add installation section to README
| * Update READMESachin Kelkar2016-06-021-0/+7
| |
* | web: use object spread operatorMaximilian Hils2016-06-023-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 flake8Maximilian Hils2016-06-021-1/+1
| |
* | Merge remote-tracking branch 'duffer/pathod-lang-generators'Maximilian Hils2016-06-023-31/+41
|\ \ | |/ |/|
| * Simplify rand_byte by creating a special case for Python 2Shadab Zafar2016-06-021-1/+5
| |
| * Enable Travis for test_language_generatorsShadab Zafar2016-06-021-2/+2
| |
| * Remove redundant __getslice__ from TransformGeneratorShadab Zafar2016-06-021-4/+0
| |
| * Py3: Return bytes from FileGeneratorShadab Zafar2016-06-022-9/+11
| | | | | | | | and use __getitem__ instead of __getslice__
| * Py3: Return bytes from RandomGeneratorShadab Zafar2016-06-022-16/+24
| | | | | | | | and use __getitem__ rather than __getslice__
* | Move the admonision to use Discourse in the issue template to the bottomAldo Cortesi2016-06-021-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/utilsAldo Cortesi2016-06-0223-298/+281
|\ \ | | | | | | Utils reorganisation
| * | Shift a bunch more string-related functions to strutilsAldo Cortesi2016-06-029-87/+82
| | |
| * | Consolidate some functions to strutils.bytes_to_escaped_strAldo Cortesi2016-06-024-29/+6
| | |
| * | xrepr is used exactly once. move to pathoc.py.Aldo Cortesi2016-06-022-5/+5
| | |
| * | Utils reorganisation: add netlib.strutilsAldo Cortesi2016-06-0217-182/+193
|/ / | | | | | | Extract a number of string and format-related functions to netlib.strutils.
* / Fix non-deterministic test failures in exportAldo Cortesi2016-06-023-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 behaveAldo Cortesi2016-06-011-1/+6
|
* Ditch IRC Travis notifications, try to fix Slack Travis notificationsAldo Cortesi2016-06-011-10/+1
|
* Remove downloads for nowAldo Cortesi2016-06-011-5/+1
| | | | Fixes #1185
* Un-break mitmproxy consoleAldo Cortesi2016-06-011-1/+1
|
* Merge pull request #1183 from mitmproxy/module-importsAldo Cortesi2016-06-0166-504/+618
|\ | | | | use module-level imports only
| * Fix test suiteAldo Cortesi2016-06-013-12/+14
| |
| * Fix lint harderAldo Cortesi2016-06-011-9/+9
| |
| * Merge branch 'module-imports' of github.com:mitmproxy/mitmproxy into ↵Aldo Cortesi2016-06-012-18/+15
| |\ | | | | | | | | | module-imports
| | * fix importsMaximilian Hils2016-05-312-16/+13
| | |
| | * fix PIL importMaximilian Hils2016-05-311-2/+2
| | |
| * | Satisfy lintAldo Cortesi2016-06-015-6/+8
| |/
| * use module-level imports onlyMaximilian Hils2016-05-3166-488/+601
| |
* | Merge pull request #1182 from cortesi/netlibimportsMaximilian Hils2016-05-3121-170/+172
|\ \ | | | | | | Reorganise netlib imports according to Google Style Guide
| * | Reorganise netlib imports according to Google Style GuideAldo Cortesi2016-06-0121-170/+172
| | |
* | | It's text markup language, Jim, but not as we know itAldo Cortesi2016-06-011-3/+3
|/ /
* | Merge remote-tracking branch 'upstream/master'Aldo Cortesi2016-06-018-28/+29
|\ \
| * \ Merge pull request #1180 from dufferzafar/pathod-baseMaximilian Hils2016-05-313-14/+16
| |\ \ | | |/ | |/| Python 3 - pathod.language.base
| | * Py3: Use byte literals for comparisonShadab Zafar2016-05-311-12/+12
| | |
| | * Py3: Use six.string_types instead of basestringShadab Zafar2016-05-311-1/+2
| | |
| | * Py3: Use range from six.movesShadab Zafar2016-05-311-1/+2
| | |
| * | be more strict about module namespacesMaximilian Hils2016-05-315-14/+13
| |/
* | Merge branch 'master' of github.com:cortesi/mitmproxyAldo Cortesi2016-06-0145-614/+622
|\|
| * Merge pull request #1179 from cortesi/reorgAldo Cortesi2016-05-3145-604/+587
| |\ | | | | | | Start reorganising */utils.py
| | * Fix tests harderAldo Cortesi2016-05-311-2/+2
| | |
| | * http2.frame -> http2.framereaderAldo Cortesi2016-05-314-12/+12
| | |
| | * Fix test failuresAldo Cortesi2016-05-311-1/+1
| | |
| | * Satisfy flake8Aldo Cortesi2016-05-319-2/+9
| | |
| | * Unify and make symmetric pretty_size and parse_sizeAldo Cortesi2016-05-312-21/+24
| | |
| | * Move human-friendly format functions to netlib.human, remove redundant ↵Aldo Cortesi2016-05-3117-141/+110
| | | | | | | | | | | | implementations
| | * utils.multipartdecode -> http.multipart.decodeAldo Cortesi2016-05-319-95/+101
| | | | | | | | | | | | | | | | | | also utils.parse_content_type -> http.headers.parse_content_type