diff -Nru variety-0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1/CHANGELOG.txt variety-0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1/CHANGELOG.txt --- variety-0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1/CHANGELOG.txt 2018-09-21 09:57:12.000000000 +0000 +++ variety-0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1/CHANGELOG.txt 2019-03-20 07:45:15.000000000 +0000 @@ -1,3 +1,6 @@ +0.7.1 + Fix remaining bugs from the Python 3 port: errors when saving favorite quotes and generating pencil_tile.png + 0.7.0 New translation: Turkish Fix possible download issues when upgrading from older Variety versions and having safe mode enabled diff -Nru variety-0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1/data/ui/changes.txt variety-0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1/data/ui/changes.txt --- variety-0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1/data/ui/changes.txt 2018-09-21 09:57:12.000000000 +0000 +++ variety-0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1/data/ui/changes.txt 2019-03-20 07:45:15.000000000 +0000 @@ -1,3 +1,6 @@ +0.7.1 + Fix remaining bugs from the Python 3 port: errors when saving favorite quotes and generating pencil_tile.png + 0.7.0 New translation: Turkish Fix possible download issues when upgrading from older Variety versions and having safe mode enabled diff -Nru variety-0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1/debian/changelog variety-0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1/debian/changelog --- variety-0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1/debian/changelog 2018-09-21 09:57:12.000000000 +0000 +++ variety-0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1/debian/changelog 2019-03-20 07:45:15.000000000 +0000 @@ -1,8 +1,15 @@ -variety (0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1) bionic; urgency=low +variety (0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1) bionic; urgency=low * Auto build. - -- Peter Levi Fri, 21 Sep 2018 09:57:12 +0000 + -- Peter Levi Wed, 20 Mar 2019 07:45:15 +0000 + +variety (0.7.1) bionic; urgency=medium + + * Fix remaining bugs from the Python 3 port: errors when saving favorite + quotes and generating pencil_tile.png + + -- James Lu Tue, 23 Oct 2018 08:49:01 -0700 variety (0.7.0) bionic; urgency=medium diff -Nru variety-0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1/debian/git-build-recipe.manifest variety-0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1/debian/git-build-recipe.manifest --- variety-0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1/debian/git-build-recipe.manifest 2018-09-21 09:57:12.000000000 +0000 +++ variety-0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1/debian/git-build-recipe.manifest 2019-03-20 07:45:15.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version 0.7.0~git201809151602.8eff230~ppa768 -lp:variety git-commit:8eff230d467804fe7ea8853115734036a45a4dc4 +# git-build-recipe format 0.4 deb-version 0.7.1~git201810231556.944aa6d~ppa772 +lp:variety git-commit:944aa6da35c4c6509ce76899f4a1122462e6ddfe diff -Nru variety-0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1/variety/VarietyWindow.py variety-0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1/variety/VarietyWindow.py --- variety-0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1/variety/VarietyWindow.py 2018-09-21 09:57:12.000000000 +0000 +++ variety-0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1/variety/VarietyWindow.py 2019-03-20 07:45:15.000000000 +0000 @@ -40,7 +40,7 @@ import re import urllib.parse import webbrowser -import pipes +import shlex from PIL import Image as PILImage random.seed() @@ -299,7 +299,7 @@ try: os.system( "convert -size 1000x1000 xc: +noise Random -virtual-pixel tile " - "-motion-blur 0x20+135 -charcoal 2 -resize 50%% %s" % pipes.quote(pencil_tile_filename.encode('utf8'))) + "-motion-blur 0x20+135 -charcoal 2 -resize 50%% %s" % shlex.quote(pencil_tile_filename)) except Exception: logger.exception(lambda: "Could not generate pencil_tile.png") threading.Timer(0, _generate_pencil_tile).start() @@ -1105,14 +1105,14 @@ w = Gdk.Screen.get_default().get_width() h = Gdk.Screen.get_default().get_height() - cmd = 'convert %s -scale %dx%d^ ' % (pipes.quote(filename), w, h) + cmd = 'convert %s -scale %dx%d^ ' % (shlex.quote(filename), w, h) logger.info(lambda: "Applying filter: " + filter) cmd += filter + ' ' - cmd += pipes.quote(target_file) - cmd = cmd.replace("%FILEPATH%", pipes.quote(filename)) - cmd = cmd.replace("%FILENAME%", pipes.quote(os.path.basename(filename))) + cmd += shlex.quote(target_file) + cmd = cmd.replace("%FILEPATH%", shlex.quote(filename)) + cmd = cmd.replace("%FILENAME%", shlex.quote(os.path.basename(filename))) logger.info(lambda: "ImageMagick filter cmd: " + cmd) return cmd.encode('utf-8') @@ -1123,7 +1123,7 @@ w = Gdk.Screen.get_default().get_width() h = Gdk.Screen.get_default().get_height() - cmd = 'convert %s -scale %dx%d^ ' % (pipes.quote(filename), w, h) + cmd = 'convert %s -scale %dx%d^ ' % (shlex.quote(filename), w, h) hoffset, voffset = Util.compute_trimmed_offsets(Util.get_size(filename), (w, h)) clock_filter = self.options.clock_filter @@ -1135,7 +1135,7 @@ cmd += clock_filter cmd += ' ' - cmd += pipes.quote(str(target_file)) + cmd += shlex.quote(target_file) logger.info(lambda: "ImageMagick clock cmd: " + cmd) return cmd.encode('utf-8') @@ -2515,7 +2515,7 @@ if self.quote_favorites_contents.find(self.current_quote_to_text()) == -1: with open(self.options.quotes_favorites_file, "a") as f: text = self.current_quote_to_text() - f.write(text.encode('utf-8')) + f.write(text) self.reload_quote_favorites_contents() self.update_indicator() self.show_notification("Saved", "Saved to %s" % self.options.quotes_favorites_file) diff -Nru variety-0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1/variety_lib/varietyconfig.py variety-0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1/variety_lib/varietyconfig.py --- variety-0.7.0~git201809151602.8eff230~ppa768~ubuntu18.04.1/variety_lib/varietyconfig.py 2018-09-21 09:57:12.000000000 +0000 +++ variety-0.7.1~git201810231556.944aa6d~ppa772~ubuntu18.04.1/variety_lib/varietyconfig.py 2019-03-20 07:45:15.000000000 +0000 @@ -1,16 +1,16 @@ # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- ### BEGIN LICENSE # Copyright (c) 2012, Peter Levi -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 3, as published +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 3, as published # by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranties of -# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranties of +# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR # PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along +# +# You should have received a copy of the GNU General Public License along # with this program. If not, see . ### END LICENSE @@ -29,7 +29,7 @@ # files). By default, this is ../data, relative your trunk layout __variety_data_directory__ = '../data' __license__ = 'GPL-3' -__version__ = '0.7.0' +__version__ = '0.7.1' import os