From 0d43663dab3af4de18ab98fbdb33168e6e0e19cc Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 4 Jan 2014 10:09:57 -0600 Subject: add mapping for ttk (fixes #49) --- CHANGES | 2 ++ documentation/index.rst | 4 +++- six.py | 1 + test_six.py | 7 +++++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index e6f7b4e..de20c4c 100644 --- a/CHANGES +++ b/CHANGES @@ -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` | diff --git a/six.py b/six.py index d197d00..3fe5198 100644 --- a/six.py +++ b/six.py @@ -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 -- cgit v1.2.1