diff --git a/qalbum/Qalbum.py b/qalbum/Qalbum.py index a453a90..943b1ae 100755 --- a/qalbum/Qalbum.py +++ b/qalbum/Qalbum.py @@ -29,7 +29,7 @@ from datetime import datetime # (c) ville.q.rantanen@gmail.com -__version__='2.20200922' +__version__='2.20200926' FILECONFIG=".config" FILEDESC="descriptions.csv" @@ -404,7 +404,7 @@ def getinfo(path,options): if not os.path.exists(os.path.join(path,options.infofile)): return '' reader = open(os.path.join(path,options.infofile),'r') - return unicode(reader.read(),encoding="utf8",errors="ignore").encode('ascii','xmlcharrefreplace') + return unescape(reader.read()) def crumblinks(crumbs, title, parent): diff --git a/setup.py b/setup.py index b2c20f1..c43b35b 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( 'scripts/Qalbum-descriptor'], package_data={'':['lib/*']}, include_package_data=True, - version = '2.20200922', + version = '2.20200926', description = 'A tool to create a web gallery from a folder structure of images / other files.', author = 'Ville Rantanen', author_email = 'ville.q.rantanen@gmail.com',