summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update changelogfix-issue-665Timothy Crosley2018-02-071-0/+1
* Bump version to 4.3.3Timothy Crosley2018-02-052-2/+2
* Merge pull request #668 from timothycrosley/feature/fix-issue-665Timothy Edmund Crosley2018-02-052-2/+11
|\
| * Fix accidentally changed linesTimothy Crosley2018-02-051-2/+2
| * Add test for desired outcomeTimothy Crosley2018-02-051-0/+9
|/
* Merge pull request #667 from timothycrosley/feature/fix-issue-666Timothy Edmund Crosley2018-02-051-0/+17
|\
| * Ensure issue #666 is fixedfeature/fix-issue-666Timothy Crosley2018-02-051-0/+17
|/
* Bump version to 4.3.24.3.2Timothy Crosley2018-02-043-3/+6
* Merge pull request #664 from timothycrosley/feature/fix-issue-662Timothy Edmund Crosley2018-02-042-2/+10
|\
| * Implement fix for issue #662feature/fix-issue-662Timothy Crosley2018-02-041-2/+2
| * Add test for issue #662Timothy Crosley2018-02-041-0/+8
|/
* Merge pull request #663 from timothycrosley/feature/fix-issue-651Timothy Edmund Crosley2018-02-032-2/+18
|\
| * Restore fix for issue #651Timothy Crosley2018-02-032-2/+18
|/
* Update changelog4.3.1Timothy Crosley2018-02-021-2/+8
* Bump version to 4.3.1Timothy Crosley2018-02-022-2/+2
* Merge pull request #660 from timothycrosley/feature/fix-issue-654Timothy Edmund Crosley2018-02-021-0/+6
|\
| * Finish fixing issue #654feature/fix-issue-654Timothy Crosley2018-02-021-0/+6
* | Merge pull request #657 from timothycrosley/feature/fix-issue-654Timothy Edmund Crosley2018-02-014-11/+28
|\ \ | |/
| * Fix indentation erroTimothy Crosley2018-02-011-4/+4
| * Implement fix for issue #654 while still supporting mode described in pull re...Timothy Crosley2018-02-014-9/+19
| * Add test case for issue #654Timothy Crosley2018-02-011-0/+7
|/
* Merge pull request #656 from asottile/patch-14.3.0Timothy Edmund Crosley2018-02-011-1/+1
|\
| * Correct `extras_require` for conditional installAnthony Sottile2018-02-011-1/+1
|/
* Merge pull request #648 from rouge8/skip-ioerrorTimothy Edmund Crosley2018-02-012-3/+13
|\
| * Don't attempt to process files we can't openAndy Freeland2018-01-312-3/+13
* | Fix syntax errorTimothy Crosley2018-02-011-1/+1
* | Fix Python2 installTimothy Crosley2018-02-011-1/+6
* | Conditonal dependency for futuresTimothy Crosley2018-02-012-4/+1
|/
* Bump version to 4.3.0Timothy Crosley2018-01-311-1/+1
* Update ACKNOWLEDGEMENTS.mdTimothy Edmund Crosley2018-01-251-0/+1
* Merge pull request #645 from gaul/typoTimothy Edmund Crosley2018-01-251-1/+1
|\
| * Correct typo in usage textAndrew Gaul2018-01-251-1/+1
|/
* Add Kathryn Lingel (@katlings) to acknowledgementsTimothy Crosley2018-01-241-0/+1
* Merge pull request #644 from katlings/issue-575Timothy Edmund Crosley2018-01-242-0/+24
|\
| * Use correct spacing between testKathryn Lingel2018-01-241-0/+2
| * Handle parenthetically enclosed imports starting after an escaped lineKathryn Lingel2018-01-242-1/+23
|/
* Merge pull request #642 from akonsta/Fix606Timothy Edmund Crosley2018-01-244-1/+10
|\
| * Fix 606, adding -k parameter to keep both direct and as imports and included ...Andrew Konstantaras2018-01-241-2/+3
| * Fix 606, adding -k parameter to keep both direct and as imports and included ...Andrew Konstantaras2018-01-241-4/+2
| * Fix 606, adding -k parameter to keep both direct and as imports and included ...Andrew Konstantaras2018-01-241-1/+1
| * Fix 606, adding -k parameter to keep both direct and as imports and included ...Andrew Konstantaras2018-01-241-0/+5
| * Fix 606, adding -k parameter to keep both direct and as importsAndrew Konstantaras2018-01-243-0/+5
* | Merge pull request #641 from jasonbrackman/developTimothy Edmund Crosley2018-01-242-3/+26
|\ \
| * | added a test for imports created at load time, such as six.moves.jasonbrackman2018-01-241-0/+24
| * | added a test for imports created at load time, such as six.moves.jasonbrackman2018-01-241-3/+2
* | | Merge pull request #640 from akonsta/Fix638Timothy Edmund Crosley2018-01-242-3/+10
|\ \ \ | | |/ | |/|
| * | Fix 638 and 613 by cleaning line earlier and fixing typo and adding \nAndrew Konstantaras2018-01-241-2/+2
| * | Fix 638 and 613 by cleaning line earlier and fixing typoAndrew Konstantaras2018-01-241-2/+2
| * | Fix 638 and 613 by cleaning line earlierAndrew Konstantaras2018-01-241-3/+3
| * | Added test for 613 and allow "from.import" syntaxAndrew Konstantaras2018-01-241-1/+0