aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Py3: Return bytes from RandomGeneratorShadab Zafar2016-06-022-16/+24
* | Move the admonision to use Discourse in the issue template to the bottomAldo Cortesi2016-06-021-1/+3
* | Merge pull request #1191 from cortesi/utilsAldo Cortesi2016-06-0223-298/+281
|\ \
| * | 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
|/ /
* / Fix non-deterministic test failures in exportAldo Cortesi2016-06-023-18/+33
|/
* 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
* Un-break mitmproxy consoleAldo Cortesi2016-06-011-1/+1
* Merge pull request #1183 from mitmproxy/module-importsAldo Cortesi2016-06-0166-504/+618
|\
| * 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 module-i...Aldo Cortesi2016-06-012-18/+15
| |\
| | * 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 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
| |\ \ | | |/ | |/|
| | * 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
| |\
| | * 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 implem...Aldo Cortesi2016-05-3117-141/+110
| | * utils.multipartdecode -> http.multipart.decodeAldo Cortesi2016-05-319-95/+101
| | * netlib.utils.get_header_tokens -> netlib.http1.read.get_header_tokensAldo Cortesi2016-05-314-25/+25
| | * isascii is unusedAldo Cortesi2016-05-311-8/+0
| | * Module is part of the name - url.decode, not url.urldecodeAldo Cortesi2016-05-3111-42/+42
| | * Extract url functions from netlib.utils and move to netlib.http.urlAldo Cortesi2016-05-3112-182/+186
| | * Start cleaning up netlib.utilsAldo Cortesi2016-05-3117-155/+157
| |/
| * Merge pull request #1178 from cortesi/pseudohdrsAldo Cortesi2016-05-314-10/+35
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 02:56:40 +0000