Merge branch 'release/0.9.3'

.req

@@ -0,0 +1,5 @@
+PyYAML <= 5.2 ; python_version == '3.4'
+PyYAML ; python_version > '3.4'
+distutils-pytest
+pytest >= 3.6.0
+pytest-dependency

.travis.yml

@@ -5,7 +5,7 @@ before_install:
   - sudo apt-get install -y libgexiv2-dev libyaml-dev python3-gi
 virtualenv:
   system_site_packages: true
-install: pip install -r requirements.txt
+install: pip install -r .req
 script: make test
 
 # Local Variables:

CHANGES

@@ -1,6 +1,12 @@
 		  History of changes to photo-tools
 		  =================================
 
+* Version 0.9.3 (2020-05-03)
+
+** Bug fixes and minor changes
+
+ + Issue #46: Fix YAMLLoadWarning.
+
 * Version 0.9.2 (2019-09-01)
 
 ** Bug fixes and minor changes

README.rst

@@ -77,13 +77,10 @@ the site-packages directory of your Python installation.
 Copyright and License
 ---------------------
 
-Copyright 2015-2019 Rolf Krahl
+Copyright 2015–2020 Rolf Krahl
 
-Licensed under the Apache License, Version 2.0 (the "License"); you
-may not use this file except in compliance with the License.  You may
-obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
+Licensed under the `Apache License`_, Version 2.0 (the "License"); you
+may not use this file except in compliance with the License.
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -92,12 +89,12 @@ implied.  See the License for the specific language governing
 permissions and limitations under the License.
 
 
-
-.. _PyYAML: http://pyyaml.org/wiki/PyYAML
+.. _PyYAML: https://github.com/yaml/pyyaml
 .. _gexiv2: https://wiki.gnome.org/Projects/gexiv2
-.. _PySide: http://qt-project.org/wiki/PySide
+.. _PySide: https://wiki.qt.io/PySide
 .. _vignette: https://github.com/hydrargyrum/vignette
-.. _pytest: http://pytest.org/
+.. _pytest: https://pytest.org/
 .. _pytest-dependency: https://github.com/RKrahl/pytest-dependency
 .. _distutils-pytest: https://github.com/RKrahl/distutils-pytest
-.. _Installing Python Modules: https://docs.python.org/2.7/install/
+.. _Installing Python Modules: https://docs.python.org/3/install/
+.. _Apache License: https://www.apache.org/licenses/LICENSE-2.0

photo/__init__.py

@@ -3,5 +3,5 @@
 This package provides tools for managing photo collections.
 """
 
-__version__ = "0.9.2"
+__version__ = "0.9.3"
 __author__ = "Rolf Krahl <[email protected]>"

photo/index.py

@@ -113,7 +113,7 @@ def read(self, idxfile=None):
         """
         self._get_idxfile(idxfile, os.O_RDWR)
         self._lockf()
-        self.items = [ IdxItem(data=i) for i in yaml.load(self.idxfile) ]
+        self.items = [ IdxItem(data=i) for i in yaml.safe_load(self.idxfile) ]
 
     def write(self, idxfile=None):
         """Write the index to a file.

python3-photo.spec

@@ -1,7 +1,7 @@
 %define pkgname		 photo
 
 Name:		python3-%{pkgname}
-Version:	0.9.2
+Version:	0.9.3
 Release:	1
 Summary:	Tools for managing photo collections
 License:	Apache-2.0

setup.py

@@ -29,14 +29,14 @@
     packages = ["photo", "photo.qt"],
     scripts = ["photoidx.py", "imageview.py"],
     classifiers = [
+        "Development Status :: 5 - Production/Stable",
+        "License :: OSI Approved :: Apache Software License",
+        "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
-        "Development Status :: 4 - Beta",
-        "License :: OSI Approved :: Apache Software License",
-        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3.8",
         ],
 )
-

tests/test_02_photoidx.py

@@ -330,7 +330,7 @@ def test_stats_all(imgdir):
         args = ["-d", str(imgdir), "stats"]
         callscript("photoidx.py", args, stdout=f)
     with fname.open("rt") as f:
-        stats = yaml.load(f)
+        stats = yaml.safe_load(f)
     assert stats["Count"] == 5
     assert stats["Oldest"] == datetime.datetime(2016, 2, 28, 17, 26, 39)
     assert stats["Newest"] == datetime.datetime(2016, 3, 9, 10, 7, 48)
@@ -359,7 +359,7 @@ def test_stats_filtered(imgdir):
         args = ["-d", str(imgdir), "stats", "--tags", "Tokyo"]
         callscript("photoidx.py", args, stdout=f)
     with fname.open("rt") as f:
-        stats = yaml.load(f)
+        stats = yaml.safe_load(f)
     assert stats["Count"] == 2
     assert stats["Oldest"] == datetime.datetime(2016, 2, 28, 17, 26, 39)
     assert stats["Newest"] == datetime.datetime(2016, 2, 29, 11, 37, 51)

tests/test_05_stats.py

@@ -51,7 +51,7 @@ def test_stats_all_yaml(imgdir):
     """The string representation of a Stats object is YAML.
     """
     with photo.index.Index(idxfile=imgdir) as idx:
-        stats = yaml.load(str(Stats(idx)))
+        stats = yaml.safe_load(str(Stats(idx)))
     assert stats["Count"] == 5
     assert stats["Selected"] == 2
     assert stats["Oldest"] == datetime.datetime(2016, 2, 28, 17, 26, 39)