summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Close branch issue_19issue_19Benjamin Peterson2014-01-040-0/+0
* MovedModule.__getattr__: Set attribute on the lazy module, so __getattr__ isn'tMarc Abramowitz2014-01-041-1/+3
* Merge upstream default into issue_19Marc Abramowitz2014-01-046-46/+140
|\
| * update copyright yearBenjamin Peterson2014-01-042-2/+2
| * rm extra spaceBenjamin Peterson2014-01-041-1/+0
| * make urllib aliases the same lazy module and remove lazy descr changesBenjamin Peterson2014-01-041-20/+8
| * Merged in alexanderlukanin13/six/urllib_import_weirdness (pull request #22)Benjamin Peterson2014-01-045-31/+115
| |\
| | * Merged in msabramo/six/fix_tkiner_typo (pull request #27)Benjamin Peterson2014-01-040-0/+0
| | |\
| | * | documentation/index.rst: Fix typo: "tkiner" -> "tkinter"Marc Abramowitz2014-01-041-1/+1
| | |/
| | * fix roleBenjamin Peterson2014-01-041-1/+1
| | * add mapping for ttk (fixes #49)Benjamin Peterson2014-01-044-3/+11
| | * Merged in msabramo/six/test_MAXSIZE__ValueError_or_OverflowError (pull reques...Benjamin Peterson2013-12-260-0/+0
| | |\
| | * | test_six.py: test_MAXSIZE allow ValueError or OverflowErrorMarc Abramowitz2013-12-261-5/+3
| | |/
| | * Merged in msabramo/six/dont_fail_tests_if_dont_have_gdbm (pull request #25)Benjamin Peterson2013-12-255-22/+85
| | |\
| | | * changelogBenjamin Peterson2013-12-251-0/+2
| | | * Merged in msabramo/six/issue_34_2 (pull request #24)Benjamin Peterson2013-12-252-6/+47
| | | |\
| | | | * Rename LazyModule to _LazyModule to reflect private natureMarc Abramowitz2013-12-251-8/+8
| | | | * test_six.py: Don't check dir on python < 2.6Marc Abramowitz2013-12-251-5/+10
| | | | * Make dir() return attributes, despite lazy loadingMarc Abramowitz2013-12-091-6/+36
| | | | * Test that dir() returns attributes, despite lazy loadingMarc Abramowitz2013-12-091-0/+6
| | | * | fix add_metaclass when __slots__ is a string (fixes #47)Benjamin Peterson2013-12-203-2/+20
| | | * | adjust commentBenjamin Peterson2013-12-201-1/+1
| | | * | remove support for Python 2.4, since py.test doesn't support it anymoreBenjamin Peterson2013-12-202-8/+7
| | | * | use replace instead regular expressionBenjamin Peterson2013-12-201-3/+1
| | | * | add change note for issue #44Benjamin Peterson2013-12-201-0/+2
| | | * | Merged in alexanderlukanin13/six/u_backslash (pull request #23)Benjamin Peterson2013-12-203-0/+4
| | | |\ \ | | | | |/
| | | * | six.u 4-byte unicode escaping fixed ('\U00000439')alexanderlukanin132013-11-272-5/+5
| | | * | fixed six.u('\\\\') in Python 2alexanderlukanin132013-11-072-5/+8
| | * | | Don't fail test if gdbm is not availableMarc Abramowitz2013-12-251-0/+11
| | | |/ | | |/|
| * | | Revert adding .idea to .hgignoreAlexander Lukanin2013-12-221-1/+0
| * | | moves import bug fixedalexanderlukanin132013-11-073-2/+30
| | |/ | |/|
* | | Add MovedModule.__getattr__; makes `from six.moves.queue import Queue` and suchMarc Abramowitz2013-12-081-0/+4
* | | Add tests for `from six.moves.queue import Queue` and `fromMarc Abramowitz2013-12-081-0/+10
* | | Merge from tip to issue_19Marc Abramowitz2013-12-085-14/+63
|\ \ \ | | |/ | |/|
| * | merge old branchBenjamin Peterson2013-11-271-0/+2
| |\ \
| | * \ merge old branchBenjamin Peterson2013-11-270-0/+0
| | |\ \
| | | * | close peterjc/fixing-typo-in-docs-tkinterscolledtext--1381094172167peterjc/fixing-typo-in-docs-tkinterscolledtext--1381094172167Benjamin Peterson2013-11-270-0/+0
| | * | | update changelog for pr #21Benjamin Peterson2013-11-271-0/+2
| | * | | Merged in alexanderlukanin13/six/proxy_bypass (pull request #21)Benjamin Peterson2013-11-272-0/+2
| | |\ \ \ | | | |_|/ | | |/| |
| * | | | Close branch proxy_bypassproxy_bypassBenjamin Peterson2013-11-270-0/+0
| | |/ / | |/| |
| * | | documentation: proxy_bypassalexanderlukanin132013-11-271-0/+1
| * | | Added six.moves.urllib.request.proxy_bypassalexanderlukanin132013-11-051-0/+1
| |/ /
| * | import mapping for xmlrpclib (fixes #43)Benjamin Peterson2013-10-143-0/+5
| * | Merged in peterjc/six/peterjc/fixing-typo-in-docs-tkinterscolledtext--1381094...Benjamin Peterson2013-10-061-1/+1
| |\ \ | | |/
| | * Fixing typo in docs, tkinter.scolledtext --> tkinter.scrolledtext [with r]peterjc2013-10-061-1/+1
| |/
| * mapping for _thread module (fixes #39)Benjamin Peterson2013-10-063-0/+5
| * add mapping for gdbm (fixes #40)Benjamin Peterson2013-10-063-0/+5
| * remove broken link to Zope five (fixes #37)Benjamin Peterson2013-09-291-2/+2
| * update intersphinx linksBenjamin Peterson2013-09-151-2/+2
| * finish sentenceBenjamin Peterson2013-09-151-1/+1