aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into testsuiteAldo Cortesi2016-06-038-533/+452
|\
| * Merge pull request #1199 from dufferzafar/pathod-generator-hotfixThomas Kriechbaumer2016-06-021-0/+2
| |\
| | * 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
| |\
| | * Update READMESachin Kelkar2016-06-021-0/+7
| * | web: use object spread operatorMaximilian Hils2016-06-023-501/+399
| * | 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
* | | Satisfy linting godsAldo Cortesi2016-06-021-1/+2
* | | Make last_log actually return last logAldo Cortesi2016-06-021-1/+1
* | | Silence requests warningsAldo Cortesi2016-06-021-0/+3
* | | Reimplement test retrievals on pathoc and ditch requestsAldo Cortesi2016-06-023-11/+27
* | | pathod.test shouldn't use the API at allAldo Cortesi2016-06-022-15/+5
* | | Since we have locks over the logs, use direct access rather than API requests...Aldo Cortesi2016-06-023-10/+7
* | | Bump error timeoutAldo Cortesi2016-06-021-1/+1
* | | Remove debug printAldo Cortesi2016-06-021-1/+0
* | | Add expect_log to the pathod test truss, and use it for last_logAldo Cortesi2016-06-021-1/+15
* | | Formatting of READMEAldo Cortesi2016-06-021-16/+22
* | | Fix lock over pathod locksAldo Cortesi2016-06-021-8/+10
* | | Honesty in testingAldo Cortesi2016-06-022-7/+1
|/ /
* | 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