diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-01-04 10:09:57 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-01-04 10:09:57 -0600 |
| commit | 0d43663dab3af4de18ab98fbdb33168e6e0e19cc (patch) | |
| tree | d8403ae734ac03c1c80bba8cd1f390eec5400b4d | |
| parent | 072edd6594784ef80e53a63502a2de84ea6f8392 (diff) | |
| download | six-0d43663dab3af4de18ab98fbdb33168e6e0e19cc.tar.gz | |
add mapping for ttk (fixes #49)
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | documentation/index.rst | 4 | ||||
| -rw-r--r-- | six.py | 1 | ||||
| -rw-r--r-- | test_six.py | 7 |
4 files changed, 11 insertions, 3 deletions
@@ -6,6 +6,8 @@ This file lists the changes in each six version. Development version ------------------- +- Issue #49: Add six.moves mapping for tkinter.ttk. + - Pull request #24: Add __dir__ special method to six.moves modules. - Issue #47: Fix add_metaclass on classes with a string for the __slots__ diff --git a/documentation/index.rst b/documentation/index.rst index 5c7860d..57a0854 100644 --- a/documentation/index.rst +++ b/documentation/index.rst @@ -505,10 +505,12 @@ Supported renames: +------------------------------+-------------------------------------+-------------------------------------+ | ``tkinter_filedialog`` | :mod:`py2:FileDialog` | :mod:`py3:tkinter.FileDialog` | +------------------------------+-------------------------------------+-------------------------------------+ -| ``tkinter_scrolledtext`` | :mod:`py2:ScrolledText` | :mod:`py3:tkinter.scrolledtext` | +| ``tkinter_scrolledtext`` | :mod:`py2:ScrolledText` | :mod:`py3:tkinter.scrolledtext` | +------------------------------+-------------------------------------+-------------------------------------+ | ``tkinter_simpledialog`` | :mod:`py2:SimpleDialog` | :mod:`py2:tkinter.simpledialog` | +------------------------------+-------------------------------------+-------------------------------------+ +| ``tkiner_ttk`` | :mod:`py2:ttk` | :mod:`py3:tkinter.ttk` | ++------------------------------+-------------------------------------+-------------------------------------+ | ``tkinter_tix`` | :mod:`py2:Tix` | :mod:`py3:tkinter.tix` | +------------------------------+-------------------------------------+-------------------------------------+ | ``tkinter_constants`` | :mod:`py2:Tkconstants` | :mod:`py3:tkinter.constants` | @@ -191,6 +191,7 @@ _moved_attributes = [ MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"), MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"), MovedModule("tkinter_tix", "Tix", "tkinter.tix"), + MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"), MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"), MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"), MovedModule("tkinter_colorchooser", "tkColorChooser", diff --git a/test_six.py b/test_six.py index db9b624..8815ee1 100644 --- a/test_six.py +++ b/test_six.py @@ -103,8 +103,11 @@ def test_move_items(item_name): except ImportError: if item_name == "winreg" and not sys.platform.startswith("win"): py.test.skip("Windows only module") - if item_name.startswith("tkinter") and not have_tkinter: - py.test.skip("requires tkinter") + if item_name.startswith("tkinter"): + if not have_tkinter: + py.test.skip("requires tkinter") + if item_name == "tkinter_ttk" and sys.version_info <= (2, 6): + py.test.skip("ttk only available on 2.7+") if item_name.startswith("dbm_gnu") and not have_gdbm: py.test.skip("requires gdbm") raise |