Merge branch 'master' into some-improvements

Author: rdbende

.appveyor.yml

@@ -1,7 +1,5 @@
 environment:
   matrix:
-    - PYTHON: "C:\\PYTHON34"
-    - PYTHON: "C:\\PYTHON35"
     - PYTHON: "C:\\PYTHON36"
     - PYTHON: "C:\\PYTHON37"
     - PYTHON: "C:\\PYTHON38"

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 required: sudo
 python:
-  - "3.5"
   - "3.6"
   - "3.7"
   - "3.8"
@@ -11,7 +10,7 @@ before_install:
   - sleep 3
 install:
   - sudo apt-get install python-tk python3-tk
-  - python -m pip install -U setuptools pip
+  - python -m pip install -U setuptools pip importlib-metadata
   - python -m pip install nose coverage codecov mock pynput
 script:
   - python -m pip install .

docs/source/conf.py

@@ -26,7 +26,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '0.11.0'
+release = '0.12.0'
 
 
 # -- Example Generation ------------------------------------------------------

setup.py

@@ -12,19 +12,19 @@ def read(file_name: str):
 
 setup(
     name="ttkwidgets",
-    packages=["ttkwidgets", "ttkwidgets.frames", "ttkwidgets.font", "ttkwidgets.autocomplete", "ttkwidgets.color"],
+    packages=["ttkwidgets", "ttkwidgets.frames", "ttkwidgets.font", "ttkwidgets.autocomplete", "ttkwidgets.color", "ttkwidgets.validated_entries"],
     py_modules=["ttkwidgets"],
     package_data={"ttkwidgets": ["assets/*"]},
-    version="0.11.0",
+    version="0.12.1",
     description=" A collection of widgets for Tkinter's ttk extensions by various authors ",
     long_description=read("README.md"),
     long_description_content_type="text/markdown",
     author="The ttkwidgets authors",
     url="https://www.github.com/RedFantom/ttkwidgets",
     download_url="https://www.github.com/RedFantom/ttkwidgets/releases",
     license="AGPL",
-    classifiers=["Programming Language :: Python :: 2.7",
-                 "Programming Language :: Python :: 3",
+    classifiers=["Programming Language :: Python :: 3",
                  "License :: OSI Approved :: GNU General Public License v3 (GPLv3)"],
+    python_requires=">=3.6",
     install_requires=["pillow"]
 )

tests/test_linklabel.py

@@ -36,3 +36,12 @@ def test_linklabel_config(self):
         self.window.update()
         label["clicked_color"] = "purple"
         self.window.update()
+
+    def test_linklabel_cget(self):
+        label = LinkLabel(self.window, link="www.google.com", text="Visit Google")
+        label.pack()
+        assert label.cget("hover_color") == label._hover_color
+        assert label.cget("link") == label._link
+        assert label.cget("normal_color") == label._normal_color
+        assert label.cget("clicked_color") == label._clicked_color
+        assert label.cget("text") == "Visit Google"

ttkwidgets/debugwindow.py

@@ -61,7 +61,7 @@ def __init__(self, master=None, title="Debug window", stdout=True,
     def save(self):
         """Save widget content."""
         file_name = fd.asksaveasfilename()
-        if file_name is "" or file_name is None:
+        if file_name == "" or file_name is None:
             return
         with open(file_name, "w") as f:
             f.write(self.text.get("1.0", tk.END))

ttkwidgets/itemscanvas.py

@@ -81,12 +81,6 @@ def left_press(self, event):
         if self.current:
             self.canvas.itemconfigure(self.current, fill=self.item_colors[self.current][1])
             self.current = None
-            return
-        results = self.canvas.find_withtag(tk.CURRENT)
-        if len(results) is 0:
-            return
-        self.current = results[0]
-        self.canvas.itemconfigure(self.current, fill=self.item_colors[self.current][2])
 
     def left_release(self, event):
         """
@@ -109,8 +103,9 @@ def left_motion(self, event):
         """
         self.set_current()
         results = self.canvas.find_withtag(tk.CURRENT)
-        if len(results) is 0:
+        if not results:
             return
+
         item = results[0]
         rectangle = self.items[item]
         self.config(cursor="fleur")

ttkwidgets/linklabel.py

@@ -108,13 +108,13 @@ def cget(self, key):
 
         To get the list of options for this widget, call the method :meth:`~LinkLabel.keys`.
         """
-        if key is "link":
+        if key == "link":
             return self._link
-        elif key is "hover_color":
+        elif key == "hover_color":
             return self._hover_color
-        elif key is "normal_color":
+        elif key == "normal_color":
             return self._normal_color
-        elif key is "clicked_color":
+        elif key == "clicked_color":
             return self._clicked_color
         else:
             return ttk.Label.cget(self, key)