openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2018
- 1 participants
- 1606 discussions
Hello community,
here is the log from the commit of package apache2-mod_jk for openSUSE:Factory checked in at 2018-11-06 14:38:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2-mod_jk (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_jk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_jk"
Tue Nov 6 14:38:42 2018 rev:35 rq:646387 version:1.2.46
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2-mod_jk/apache2-mod_jk.changes 2018-09-26 16:12:04.767420624 +0200
+++ /work/SRC/openSUSE:Factory/.apache2-mod_jk.new/apache2-mod_jk.changes 2018-11-06 14:39:16.556606256 +0100
@@ -1,0 +2,32 @@
+Mon Nov 5 09:56:03 UTC 2018 - Pedro Monreal Gonzalez <pmonrealgonzalez(a)suse.com>
+
+- Update to version 1.2.46
+ Fixes:
+ * Apache: Fix regression in 1.2.44 which resulted in
+ socket_connect_timeout to be interpreted in units of seconds
+ instead of milliseconds on platforms that provide poll(). (rjung)
+ * Security: CVE-2018-11759 Connector path traversal [bsc#1114612]
+
+- Update to version 1.2.45
+ Fixes:
+ * Correct regression in 1.2.44 that broke request handling for
+ OPTIONS * requests. (rjung)
+ * Improve path parameter parsing so that the session ID specified
+ by the session_path worker property for load-balanced workers
+ can be extracted from a path parameter in any segment of the
+ URI, rather than only from the final segment. (markt)
+ * Apache: Improve path parameter handling so that JkStripSession
+ can remove session IDs that are specified on path parameters in any
+ segment of the URI rather than only the final segment. (markt)
+ * IIS: Improve path parameter handling so that strip_session can
+ remove session IDs that are specified on path parameters in any
+ segment of the URI rather than only the final segment. (markt)
+ Updates:
+ * Apache: Update the documentation to note additional
+ limitations of the JkAutoAlias directive. (markt)
+ Code:
+ * Common: Optimize path parameter handling. (rjung)
+
+- Cleaned with spec-cleaner
+
+-------------------------------------------------------------------
Old:
----
tomcat-connectors-1.2.44-src.tar.gz
tomcat-connectors-1.2.44-src.tar.gz.asc
New:
----
tomcat-connectors-1.2.46-src.tar.gz
tomcat-connectors-1.2.46-src.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_jk.spec ++++++
--- /var/tmp/diff_new_pack.pYJkIY/_old 2018-11-06 14:39:24.340594494 +0100
+++ /var/tmp/diff_new_pack.pYJkIY/_new 2018-11-06 14:39:24.348594482 +0100
@@ -12,18 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define connectors_root tomcat-connectors-%{version}-src
Name: apache2-mod_jk
-Version: 1.2.44
+Version: 1.2.46
Release: 0
Summary: Connectors between Apache and Tomcat Servlet Container
License: Apache-2.0
Group: Productivity/Networking/Web/Frontends
-Url: http://tomcat.apache.org/connectors-doc/
+URL: http://tomcat.apache.org/connectors-doc/
Source0: http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-%{…
Source1: jk.conf
Source2: README.SUSE
@@ -40,7 +40,6 @@
Provides: tomcat-mod = %{version}
Obsoletes: mod_jk-ap20 < %{version}
Obsoletes: tomcat-mod < %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This package provides modules for Apache to invisibly integrate Tomcat
@@ -81,8 +80,8 @@
set -x
%files
-%defattr(-,root,root,-)
-%doc LICENSE README.SUSE
+%license LICENSE
+%doc README.SUSE
%doc conf/workers.properties
%doc jk.conf
%{apache_libexecdir}/*
++++++ tomcat-connectors-1.2.44-src.tar.gz -> tomcat-connectors-1.2.46-src.tar.gz ++++++
++++ 1764 lines of diff (skipped)
1
0
06 Nov '18
Hello community,
here is the log from the commit of package systemd-presets-branding-transactional-server for openSUSE:Factory checked in at 2018-11-06 14:38:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd-presets-branding-transactional-server (Old)
and /work/SRC/openSUSE:Factory/.systemd-presets-branding-transactional-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd-presets-branding-transactional-server"
Tue Nov 6 14:38:38 2018 rev:3 rq:646379 version:15.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd-presets-branding-transactional-server/systemd-presets-branding-transactional-server.changes 2018-08-10 09:50:10.894308974 +0200
+++ /work/SRC/openSUSE:Factory/.systemd-presets-branding-transactional-server.new/systemd-presets-branding-transactional-server.changes 2018-11-06 14:38:51.320644391 +0100
@@ -1,0 +2,6 @@
+Tue Oct 30 15:33:21 UTC 2018 - lnussel(a)suse.de
+
+- enable ca-certificates.service for transactional server. Normal
+ systems don't need it at boot (boo#1088378).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ 50-transactional-server.preset ++++++
--- /var/tmp/diff_new_pack.v2tIp2/_old 2018-11-06 14:38:52.964641907 +0100
+++ /var/tmp/diff_new_pack.v2tIp2/_new 2018-11-06 14:38:52.968641901 +0100
@@ -1,3 +1,4 @@
enable transactional-update.timer
enable create-dirs-from-rpmdb.service
-enable rebootmgr.service
\ No newline at end of file
+enable rebootmgr.service
+enable ca-certificates.service
1
0
Hello community,
here is the log from the commit of package php7-pear-Net_Sieve for openSUSE:Factory checked in at 2018-11-06 14:38:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php7-pear-Net_Sieve (Old)
and /work/SRC/openSUSE:Factory/.php7-pear-Net_Sieve.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7-pear-Net_Sieve"
Tue Nov 6 14:38:33 2018 rev:2 rq:646334 version:1.4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/php7-pear-Net_Sieve/php7-pear-Net_Sieve.changes 2017-11-15 16:50:56.359115920 +0100
+++ /work/SRC/openSUSE:Factory/.php7-pear-Net_Sieve.new/php7-pear-Net_Sieve.changes 2018-11-06 14:38:46.288651996 +0100
@@ -1,0 +2,17 @@
+Sun Nov 4 23:43:53 UTC 2018 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Use noun phrase in summary.
+
+-------------------------------------------------------------------
+Sun Nov 4 16:44:54 UTC 2018 - Aeneas Jaißle <aj(a)ajaissle.de>
+
+- New upstream release 1.4.4
+ * Fix PHP 7.3: Declaration of case-insensitive constants is deprecated
+
+- Changes 1.4.3:
+ * Support GSSAPI authentication
+
+- Changes 1.4.2:
+ * Composer: Fix license identifier, don't use unbound version numbers for deps
+
+-------------------------------------------------------------------
Old:
----
Net_Sieve-1.4.1.tgz
New:
----
Net_Sieve-1.4.4.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php7-pear-Net_Sieve.spec ++++++
--- /var/tmp/diff_new_pack.Xg6neb/_old 2018-11-06 14:38:47.104650763 +0100
+++ /var/tmp/diff_new_pack.Xg6neb/_new 2018-11-06 14:38:47.112650751 +0100
@@ -1,7 +1,7 @@
#
# spec file for package php7-pear-Net_Sieve
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,33 +12,37 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define php_name php7
%define pear_name Net_Sieve
Name: php7-pear-Net_Sieve
-Version: 1.4.1
+Version: 1.4.4
Release: 0
-Summary: Handles talking to a sieve server
+Summary: PHP module for talking to a sieve server
License: BSD-2-Clause
Group: Development/Libraries/Other
Url: http://pear.php.net/package/%{pear_name}
Source: http://download.pear.php.net/package/%{pear_name}-%{version}.tgz
-BuildRequires: %{php_name}-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: %{php_name}-devel >= 5.0
BuildRequires: %{php_name}-pear
-Requires: %{php_name}
+%if 0%{?suse_version} < 1330
+BuildRequires: %{php_name}-macros
+%endif
+BuildArch: noarch
+
+Requires: %{php_name} >= 5.0
Requires: %{php_name}-pear
Requires: php-pear(Net_Socket) >= 1.0
+
Suggests: php-pear(Auth_SASL) >= 1.0
+
Provides: php-pear-%{pear_name} = %{version}
Provides: php-pear(%{pear_name}) = %{version}
Obsoletes: php5-pear-%{pear_name}
-BuildArch: noarch
-%if 0%{?suse_version} < 1330
-BuildRequires: %{php_name}-macros
-%endif
%description
This package provides an API to talk to servers implementing the managesieve protocol. It can be used to install and remove sieve scripts, mark them active etc.
++++++ Net_Sieve-1.4.1.tgz -> Net_Sieve-1.4.4.tgz ++++++
++++ 16907 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package lollypop for openSUSE:Factory checked in at 2018-11-06 14:38:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lollypop (Old)
and /work/SRC/openSUSE:Factory/.lollypop.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lollypop"
Tue Nov 6 14:38:28 2018 rev:55 rq:646258 version:0.9.611
Changes:
--------
--- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2018-10-29 14:58:59.546026098 +0100
+++ /work/SRC/openSUSE:Factory/.lollypop.new/lollypop.changes 2018-11-06 14:38:42.316657999 +0100
@@ -1,0 +2,6 @@
+Sun Nov 4 13:13:12 UTC 2018 - antoine.belvire(a)opensuse.org
+
+- Update to version 0.9.611:
+ * Fix an issue with track management.
+
+-------------------------------------------------------------------
Old:
----
lollypop-0.9.610.tar.xz
New:
----
lollypop-0.9.611.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lollypop.spec ++++++
--- /var/tmp/diff_new_pack.IGHGlG/_old 2018-11-06 14:38:44.048655381 +0100
+++ /var/tmp/diff_new_pack.IGHGlG/_new 2018-11-06 14:38:44.068655351 +0100
@@ -17,7 +17,7 @@
Name: lollypop
-Version: 0.9.610
+Version: 0.9.611
Release: 0
Summary: GNOME music playing application
License: GPL-3.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.IGHGlG/_old 2018-11-06 14:38:44.220655122 +0100
+++ /var/tmp/diff_new_pack.IGHGlG/_new 2018-11-06 14:38:44.224655115 +0100
@@ -1,7 +1,7 @@
<services>
<service mode="disabled" name="tar_scm">
<param name="changesgenerate">enable</param>
- <param name="revision">0.9.610</param>
+ <param name="revision">0.9.611</param>
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/World/lollypop.git</param>
<param name="versionformat">@PARENT_TAG@</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.IGHGlG/_old 2018-11-06 14:38:44.316654977 +0100
+++ /var/tmp/diff_new_pack.IGHGlG/_new 2018-11-06 14:38:44.332654952 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.gnome.org/World/lollypop.git</param>
- <param name="changesrevision">76fcc86c22c0df02c644be78368efe6255199cbe</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">a7802ca5d12288d690bf7fdcbdf6afcd1ccc2d6a</param></service></servicedata>
\ No newline at end of file
++++++ lollypop-0.9.610.tar.xz -> lollypop-0.9.611.tar.xz ++++++
++++ 51899 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package mate-menu for openSUSE:Factory checked in at 2018-11-06 14:38:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-menu (Old)
and /work/SRC/openSUSE:Factory/.mate-menu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-menu"
Tue Nov 6 14:38:20 2018 rev:19 rq:646256 version:18.04.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-menu/mate-menu.changes 2018-03-20 21:57:53.831002534 +0100
+++ /work/SRC/openSUSE:Factory/.mate-menu.new/mate-menu.changes 2018-11-06 14:38:38.176664256 +0100
@@ -1,0 +2,6 @@
+Sat Nov 3 20:36:06 UTC 2018 - sor.alexei(a)meowr.ru
+
+- Update to version 18.04.3 (changes since 18.04.1):
+ * Update translations.
+
+-------------------------------------------------------------------
Old:
----
mate-menu-18.04.1.tar.gz
New:
----
mate-menu-18.04.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-menu.spec ++++++
--- /var/tmp/diff_new_pack.Xp3M0n/_old 2018-11-06 14:38:39.056662926 +0100
+++ /var/tmp/diff_new_pack.Xp3M0n/_new 2018-11-06 14:38:39.060662920 +0100
@@ -12,13 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define _name mate_menu
Name: mate-menu
-Version: 18.04.1
+Version: 18.04.3
Release: 0
Summary: Advanced MATE menu
License: GPL-2.0-or-later
@@ -98,11 +98,7 @@
%endif
%files
-%if 0%{?suse_version} >= 1500
%license COPYING
-%else
-%doc COPYING
-%endif
%doc README.md
%{_bindir}/%{name}
%{_libexecdir}/%{name}/
++++++ mate-menu-18.04.1.tar.gz -> mate-menu-18.04.3.tar.gz ++++++
++++ 32206 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package converseen for openSUSE:Factory checked in at 2018-11-06 14:37:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/converseen (Old)
and /work/SRC/openSUSE:Factory/.converseen.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "converseen"
Tue Nov 6 14:37:43 2018 rev:33 rq:646253 version:0.9.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/converseen/converseen.changes 2018-10-17 08:42:51.949781233 +0200
+++ /work/SRC/openSUSE:Factory/.converseen.new/converseen.changes 2018-11-06 14:38:31.276674684 +0100
@@ -1,0 +2,7 @@
+Thu Nov 1 07:11:35 UTC 2018 - Kyrill Detinov <lazy.kent(a)opensuse.org>
+
+- Update to 0.9.7.2.
+ * Updated Japanese Localization.
+ * Various bugfixes.
+
+-------------------------------------------------------------------
Old:
----
converseen-0.9.7.1.tar.bz2
New:
----
converseen-0.9.7.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ converseen.spec ++++++
--- /var/tmp/diff_new_pack.4JVfsk/_old 2018-11-06 14:38:33.164671831 +0100
+++ /var/tmp/diff_new_pack.4JVfsk/_new 2018-11-06 14:38:33.168671825 +0100
@@ -17,7 +17,7 @@
Name: converseen
-Version: 0.9.7.1
+Version: 0.9.7.2
Release: 0
Summary: Batch Image Conversion Tool
License: GPL-3.0-or-later
++++++ converseen-0.9.7.1.tar.bz2 -> converseen-0.9.7.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/.directory new/converseen-0.9.7.2/.directory
--- old/converseen-0.9.7.1/.directory 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/.directory 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-[Dolphin]
-Timestamp=2018,10,11,17,3,56
-Version=4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/converseen.rc new/converseen-0.9.7.2/converseen.rc
--- old/converseen-0.9.7.1/converseen.rc 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/converseen.rc 2018-10-24 01:43:22.076723555 +0200
@@ -61,8 +61,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,7,1
- PRODUCTVERSION 0,9,7,1
+ FILEVERSION 0,9,7,2
+ PRODUCTVERSION 0,9,7,2
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -80,13 +80,13 @@
VALUE "Comments", "The batch image converter and resizer"
VALUE "CompanyName", "Francesco Mondello"
VALUE "FileDescription", "Converseen - The batch converter and resizer"
- VALUE "FileVersion", "0.9.7.1"
+ VALUE "FileVersion", "0.9.7.2"
VALUE "InternalName", "Converseen"
VALUE "LegalCopyright", "(C) 2009 - 2018 Francesco Mondello GNU - GPL"
VALUE "LegalTrademarks", "(C) 2009 - 2018 Francesco Mondello GNU - GPL"
VALUE "OriginalFilename", "converseen.exe"
VALUE "ProductName", "Converseen"
- VALUE "ProductVersion", "0.9.7.1"
+ VALUE "ProductVersion", "0.9.7.2"
END
END
BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_cs_CZ.ts new/converseen-0.9.7.2/loc/converseen_cs_CZ.ts
--- old/converseen-0.9.7.1/loc/converseen_cs_CZ.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_cs_CZ.ts 2018-10-24 01:43:22.076723555 +0200
@@ -420,10 +420,6 @@
<translation>&Nápověda</translation>
</message>
<message>
- <source>Actions Panel</source>
- <translation type="obsolete">Panel činností</translation>
- </message>
- <message>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -720,18 +716,6 @@
<translation>Žádné otočení</translation>
</message>
<message>
- <source>+ 90°</source>
- <translation type="vanished">+ 90°</translation>
- </message>
- <message>
- <source>- 90°</source>
- <translation type="vanished">- 90°</translation>
- </message>
- <message>
- <source>180°</source>
- <translation type="vanished">180°</translation>
- </message>
- <message>
<source>Flip image:</source>
<translation>Obrátit obrázek:</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_da_DK.ts new/converseen-0.9.7.2/loc/converseen_da_DK.ts
--- old/converseen-0.9.7.1/loc/converseen_da_DK.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_da_DK.ts 2018-10-24 01:43:22.080056903 +0200
@@ -169,18 +169,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source><html><head/><body><p align="center"><span style=" font-weight:600;">If you appreciate this work and would like to support the project, you are welcome to donate via PayPal or Flattr</span></p></body></html></source>
- <translation type="vanished"><html><head/><body><p align="center"><span style=" font-weight:600;">Hvis du sætter pris på dette arbejde, og gerne vil støtte projektet; Er du velkommen til at donere via PayPal eller Flattr</span></p></body></html></translation>
- </message>
- <message>
- <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2';">(c) 2009 - 2017 Francesco Mondello GNU - GPL v.3</span></p></body></html></source>
- <translation type="vanished"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2';">(c) 2009 - 2017 Francesco Mondello GNU - GPL v.3</span></p></body></html></translation>
- </message>
- <message>
<location filename="../ui/dialoginfo.ui" line="44"/>
<source>-</source>
<translation>-</translation>
@@ -520,10 +508,6 @@
<translation>&Hjælp</translation>
</message>
<message>
- <source>Actions Panel</source>
- <translation type="vanished">Handlingspanel</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="247"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -699,18 +683,6 @@
<translation>Ingen rotering</translation>
</message>
<message>
- <source>+ 90°</source>
- <translation type="vanished">+ 90°</translation>
- </message>
- <message>
- <source>- 90°</source>
- <translation type="vanished">- 90°</translation>
- </message>
- <message>
- <source>180°</source>
- <translation type="vanished">180°</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="856"/>
<source>Flip image:</source>
<translation>Spejlvend billede:</translation>
@@ -956,10 +928,6 @@
<translation>&Rapportér fejl...</translation>
</message>
<message>
- <source>&Flattr This!</source>
- <translation type="vanished">&Flattr dette!</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="1314"/>
<source>&Check for updates</source>
<translation>&Check for opdateringer</translation>
@@ -999,10 +967,6 @@
<source>Import windows icon (*.ico *.icon)</source>
<translation>Importér Windows-icon (*.ico *.icon)</translation>
</message>
- <message>
- <source>Donate via Flattr</source>
- <translation type="vanished">Donér via Flattr</translation>
- </message>
</context>
<context>
<name>MainWindowImpl</name>
@@ -1092,22 +1056,22 @@
<translation>Forhåndsvisning</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="933"/>
+ <location filename="../src/mainwindowimpl.cpp" line="935"/>
<source>Suggest a new name!</source>
<translation>Foreslå et nyt navn!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="934"/>
+ <location filename="../src/mainwindowimpl.cpp" line="936"/>
<source>New name:</source>
<translation>Nyt navn:</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="939"/>
+ <location filename="../src/mainwindowimpl.cpp" line="941"/>
<source>Please, specify a name!</source>
<translation>Angiv venligst et navn!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="940"/>
+ <location filename="../src/mainwindowimpl.cpp" line="942"/>
<source>You should specify a name.
Click Retry to specify a new name.
Click Ignore to cancel this operation.
@@ -1118,23 +1082,23 @@
Klik "Afbryd" for at annullere alle operationer.</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="955"/>
- <location filename="../src/mainwindowimpl.cpp" line="960"/>
+ <location filename="../src/mainwindowimpl.cpp" line="957"/>
+ <location filename="../src/mainwindowimpl.cpp" line="962"/>
<source>Warning!</source>
<translation>Advarsel!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="956"/>
+ <location filename="../src/mainwindowimpl.cpp" line="958"/>
<source>The filename should not be empty!</source>
<translation>Filnavnet skal ikke være tomt!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="961"/>
+ <location filename="../src/mainwindowimpl.cpp" line="963"/>
<source>The name chosen is identical to the initial one. Do you want to overwrite the original file?</source>
<translation>Det valgte navn er identisk med det originale. Ønsker du at overskrive den originale fil?</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="977"/>
+ <location filename="../src/mainwindowimpl.cpp" line="979"/>
<source>Aborted!</source>
<translation>Afbrudt!</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_de_DE.ts new/converseen-0.9.7.2/loc/converseen_de_DE.ts
--- old/converseen-0.9.7.1/loc/converseen_de_DE.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_de_DE.ts 2018-10-24 01:43:22.080056903 +0200
@@ -206,10 +206,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source><html><head/><body><p align="center"><span style=" font-weight:600;">If you appreciate this work and would like to support the project, you are welcome to donate via PayPal or Flattr</span></p></body></html></source>
- <translation type="vanished"><html><head/><body><p align="center"><span style=" font-weight:600;">Wenn Sie diese Arbeit anerkennen und das Projekt unterstützen möchten, sind Sie herzlich willkommen via Paypal oder Flattr zu spenden</span></p></body></html></translation>
- </message>
- <message>
<location filename="../ui/dialoginfo.ui" line="44"/>
<source>-</source>
<translation>-</translation>
@@ -517,10 +513,6 @@
<translation>&Hilfe</translation>
</message>
<message>
- <source>Actions Panel</source>
- <translation type="obsolete">Aktionsleiste</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="247"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -696,18 +688,6 @@
<translation>Keine Drehung</translation>
</message>
<message>
- <source>+ 90°</source>
- <translation type="vanished">+ 90°</translation>
- </message>
- <message>
- <source>- 90°</source>
- <translation type="vanished">- 90°</translation>
- </message>
- <message>
- <source>180°</source>
- <translation type="vanished">180°</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="856"/>
<source>Flip image:</source>
<translation>Bild spiegeln:</translation>
@@ -992,10 +972,6 @@
<source>Import windows icon (*.ico *.icon)</source>
<translation>Importieren Windows-Icon (*.ico *.ico)</translation>
</message>
- <message>
- <source>Donate via Flattr</source>
- <translation type="vanished">Spenden via Flattr</translation>
- </message>
</context>
<context>
<name>MainWindowImpl</name>
@@ -1085,22 +1061,22 @@
<translation>Vorschau</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="933"/>
+ <location filename="../src/mainwindowimpl.cpp" line="935"/>
<source>Suggest a new name!</source>
<translation>Schlage einen neuen Namen vor!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="934"/>
+ <location filename="../src/mainwindowimpl.cpp" line="936"/>
<source>New name:</source>
<translation>Neuer Name:</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="939"/>
+ <location filename="../src/mainwindowimpl.cpp" line="941"/>
<source>Please, specify a name!</source>
<translation>Bitte gib einen Namen an!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="940"/>
+ <location filename="../src/mainwindowimpl.cpp" line="942"/>
<source>You should specify a name.
Click Retry to specify a new name.
Click Ignore to cancel this operation.
@@ -1111,23 +1087,23 @@
Klicke "Abbrechen", um alle Operationen abzubrechen.</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="955"/>
- <location filename="../src/mainwindowimpl.cpp" line="960"/>
+ <location filename="../src/mainwindowimpl.cpp" line="957"/>
+ <location filename="../src/mainwindowimpl.cpp" line="962"/>
<source>Warning!</source>
<translation>Warnung!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="956"/>
+ <location filename="../src/mainwindowimpl.cpp" line="958"/>
<source>The filename should not be empty!</source>
<translation>Der Dateiname muss angegeben werden!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="961"/>
+ <location filename="../src/mainwindowimpl.cpp" line="963"/>
<source>The name chosen is identical to the initial one. Do you want to overwrite the original file?</source>
<translation>Der ausgewählte Name ist identisch mit dem vorherigen. Willst du die Originaldatei überschreiben?</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="977"/>
+ <location filename="../src/mainwindowimpl.cpp" line="979"/>
<source>Aborted!</source>
<translation>Abgebrochen!</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_es_CL.ts new/converseen-0.9.7.2/loc/converseen_es_CL.ts
--- old/converseen-0.9.7.1/loc/converseen_es_CL.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_es_CL.ts 2018-10-24 01:43:22.080056903 +0200
@@ -209,10 +209,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source><html><head/><body><p align="center"><span style=" font-weight:600;">If you appreciate this work and would like to support the project, you are welcome to donate via PayPal or Flattr</span></p></body></html></source>
- <translation type="vanished"><html><head/><body><p align="center"><span style=" font-weight:600;">Si te agrada este proyecto y quieres apoyarnos, agradeceremos que envíes tu aporte mediante PayPal o Flattr</span></p></body></html></translation>
- </message>
- <message>
<location filename="../ui/dialoginfo.ui" line="53"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -514,10 +510,6 @@
<translation>Ayuda</translation>
</message>
<message>
- <source>Actions Panel</source>
- <translation type="obsolete">Panel de acciones</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="247"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -693,18 +685,6 @@
<translation>No rotar</translation>
</message>
<message>
- <source>+ 90°</source>
- <translation type="vanished">+ 90°</translation>
- </message>
- <message>
- <source>- 90°</source>
- <translation type="vanished">- 90°</translation>
- </message>
- <message>
- <source>180°</source>
- <translation type="vanished">180°</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="856"/>
<source>Flip image:</source>
<translation>Invertir imagen:</translation>
@@ -989,10 +969,6 @@
<source>Import windows icon (*.ico *.icon)</source>
<translation>Importar ícono de Windows (*.ico *.icon)</translation>
</message>
- <message>
- <source>Donate via Flattr</source>
- <translation type="vanished">Donar via Flattr</translation>
- </message>
</context>
<context>
<name>MainWindowImpl</name>
@@ -1082,22 +1058,22 @@
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="933"/>
+ <location filename="../src/mainwindowimpl.cpp" line="935"/>
<source>Suggest a new name!</source>
<translation>Sugiere un nuevo nombre.</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="934"/>
+ <location filename="../src/mainwindowimpl.cpp" line="936"/>
<source>New name:</source>
<translation>Nuevo nombre:</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="939"/>
+ <location filename="../src/mainwindowimpl.cpp" line="941"/>
<source>Please, specify a name!</source>
<translation>Por favor, especifica un nombre.</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="940"/>
+ <location filename="../src/mainwindowimpl.cpp" line="942"/>
<source>You should specify a name.
Click Retry to specify a new name.
Click Ignore to cancel this operation.
@@ -1108,23 +1084,23 @@
Haz clic en Abortar para cancelar todas las operaciones.</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="955"/>
- <location filename="../src/mainwindowimpl.cpp" line="960"/>
+ <location filename="../src/mainwindowimpl.cpp" line="957"/>
+ <location filename="../src/mainwindowimpl.cpp" line="962"/>
<source>Warning!</source>
<translation>Advertencia</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="956"/>
+ <location filename="../src/mainwindowimpl.cpp" line="958"/>
<source>The filename should not be empty!</source>
<translation>El nombre de archivo no debería estar vacío.</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="961"/>
+ <location filename="../src/mainwindowimpl.cpp" line="963"/>
<source>The name chosen is identical to the initial one. Do you want to overwrite the original file?</source>
<translation>El nombre escogido es idéntico al original. ¿Deseas sobreescribir el archivo original?</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="977"/>
+ <location filename="../src/mainwindowimpl.cpp" line="979"/>
<source>Aborted!</source>
<translation>Abortado</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_fr_FR.ts new/converseen-0.9.7.2/loc/converseen_fr_FR.ts
--- old/converseen-0.9.7.1/loc/converseen_fr_FR.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_fr_FR.ts 2018-10-24 01:43:22.080056903 +0200
@@ -204,22 +204,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source><html><head/><body><p align="center"><span style=" font-weight:600;">If you appreciate this work and would like to support the project, you are welcome to donate via PayPal or Flattr</span></p></body></html></source>
- <translation type="vanished"><html><head/><body><p align="center"><span style=" font-weight:600;">Si vous appréciez ce travail et que vous voulez supporter le projet, vous pouvez effectuer un don via PayPal ou Flattr</span></p></body></html></translation>
- </message>
- <message>
- <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2';">(c) 2009 - 2017 Francesco Mondello GNU - GPL v.3</span></p></body></html></source>
- <translation type="vanished"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2';">(c) 2009 - 2017 Francesco Mondello GNU - GPL v.3</span></p></body></html></translation>
- </message>
- <message>
<location filename="../ui/dialoginfo.ui" line="291"/>
<source><html><head/><body><p><span style=" font-size:11pt; font-weight:600;">Follow Converseen:</span></p></body></html></source>
<translation><html><head/><body><p><span style=" font-size:11pt; font-weight:600;">Suivre Converseen:</span></p></body></html></translation>
@@ -530,10 +514,6 @@
<translation>Ai&de</translation>
</message>
<message>
- <source>Actions Panel</source>
- <translation type="vanished">Panneau d'Actions</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="247"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -729,18 +709,6 @@
<translation>Pas de rotation</translation>
</message>
<message>
- <source>+ 90°</source>
- <translation type="vanished">+90°</translation>
- </message>
- <message>
- <source>- 90°</source>
- <translation type="vanished">-90°</translation>
- </message>
- <message>
- <source>180°</source>
- <translation type="vanished">180°</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="856"/>
<source>Flip image:</source>
<translation>Retournement de l'image:</translation>
@@ -981,10 +949,6 @@
<translation>&Rapporter un bogue...</translation>
</message>
<message>
- <source>&Flattr This!</source>
- <translation type="vanished">Faire un don sur &Flattr !</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="1314"/>
<source>&Check for updates</source>
<translation>Vérifier les mises à &jour</translation>
@@ -1009,10 +973,6 @@
<source>Import windows icon (*.ico *.icon)</source>
<translation>Importer un icône Windows (*.ico *.icon)</translation>
</message>
- <message>
- <source>Donate via Flattr</source>
- <translation type="vanished">Faire un don via Flattr</translation>
- </message>
</context>
<context>
<name>MainWindowImpl</name>
@@ -1092,22 +1052,22 @@
<translation>Prévisualiser</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="933"/>
+ <location filename="../src/mainwindowimpl.cpp" line="935"/>
<source>Suggest a new name!</source>
<translation>Entrez un Nouveau Nom !</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="934"/>
+ <location filename="../src/mainwindowimpl.cpp" line="936"/>
<source>New name:</source>
<translation>Nouveau Nom:</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="939"/>
+ <location filename="../src/mainwindowimpl.cpp" line="941"/>
<source>Please, specify a name!</source>
<translation>Veuillez spécifier un nom !</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="940"/>
+ <location filename="../src/mainwindowimpl.cpp" line="942"/>
<source>You should specify a name.
Click Retry to specify a new name.
Click Ignore to cancel this operation.
@@ -1118,23 +1078,23 @@
Cliquez sur Abandonner pour annuler toutes les opérations.</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="955"/>
- <location filename="../src/mainwindowimpl.cpp" line="960"/>
+ <location filename="../src/mainwindowimpl.cpp" line="957"/>
+ <location filename="../src/mainwindowimpl.cpp" line="962"/>
<source>Warning!</source>
<translation>Avertissement !</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="956"/>
+ <location filename="../src/mainwindowimpl.cpp" line="958"/>
<source>The filename should not be empty!</source>
<translation>Le nom de fichier ne de devrait pas être vide !</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="961"/>
+ <location filename="../src/mainwindowimpl.cpp" line="963"/>
<source>The name chosen is identical to the initial one. Do you want to overwrite the original file?</source>
<translation>Le nom choisi est identique à l'original. Désirez-vous écraser le fichier original ?</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="977"/>
+ <location filename="../src/mainwindowimpl.cpp" line="979"/>
<source>Aborted!</source>
<translation>Abandonné !</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_hu_HU.ts new/converseen-0.9.7.2/loc/converseen_hu_HU.ts
--- old/converseen-0.9.7.1/loc/converseen_hu_HU.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_hu_HU.ts 2018-10-24 01:43:22.080056903 +0200
@@ -420,10 +420,6 @@
<translation>&Segítség</translation>
</message>
<message>
- <source>Actions Panel</source>
- <translation type="obsolete">Műveletek panel</translation>
- </message>
- <message>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_it_IT.ts new/converseen-0.9.7.2/loc/converseen_it_IT.ts
--- old/converseen-0.9.7.1/loc/converseen_it_IT.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_it_IT.ts 2018-10-24 01:43:22.080056903 +0200
@@ -164,22 +164,6 @@
<translation><strong>Traduzione polacca: </strong>Michał Olber from OSWorld.pl - <a href="mailto:redakcja@osworld.pl">redakcja@osworld.pl</a></translation>
</message>
<message>
- <source><html><head/><body><p align="center"><span style=" font-weight:600;">If you appreciate this work and would like to support the project, you are welcome to donate via PayPal or Flattr</span></p></body></html></source>
- <translation type="vanished"><html><head/><body><p align="center"><span style=" font-weight:600;">Se hai apprezzato questo progetto e vuoi collaborare puoi effettuare una donazione via PayPal o Flattr</span></p></body></html></translation>
- </message>
- <message>
- <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2';">(c) 2009 - 2017 Francesco Mondello GNU - GPL v.3</span></p></body></html></source>
- <translation type="vanished"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2';">(c) 2009 - 2017 Francesco Mondello GNU - GPL v.3</span></p></body></html</translation>
- </message>
- <message>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -442,10 +426,6 @@
<translation>A&iuto</translation>
</message>
<message>
- <source>Actions Panel</source>
- <translation type="vanished">Pannello delle azioni</translation>
- </message>
- <message>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -746,18 +726,6 @@
<translation>Nessuna rotazione</translation>
</message>
<message>
- <source>+ 90°</source>
- <translation type="vanished">+ 90°</translation>
- </message>
- <message>
- <source>- 90°</source>
- <translation type="vanished">- 90°</translation>
- </message>
- <message>
- <source>180°</source>
- <translation type="vanished">180°</translation>
- </message>
- <message>
<source>Flip image:</source>
<translation>Rifletti immagine:</translation>
</message>
@@ -794,10 +762,6 @@
<translation>Importa icona di Windows (*.ico *.icon)</translation>
</message>
<message>
- <source>Donate via Flattr</source>
- <translation type="vanished">Dona via Flattr</translation>
- </message>
- <message>
<source>Prefi&x/Suffix</source>
<translation>Pre&fisso/Suffisso</translation>
</message>
@@ -814,10 +778,6 @@
<translation>&Riporta bug...</translation>
</message>
<message>
- <source>&Flattr This!</source>
- <translation type="vanished">Dona con F&lattr!</translation>
- </message>
- <message>
<source>Check if a new version of Converseen is available</source>
<translation>Controlla se sono disponibili nuove versioni di Converseen</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_ja_JP.ts new/converseen-0.9.7.2/loc/converseen_ja_JP.ts
--- old/converseen-0.9.7.1/loc/converseen_ja_JP.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_ja_JP.ts 2018-10-24 01:43:22.080056903 +0200
@@ -168,10 +168,6 @@
<translation><html><head/><body><p><span style=" font-size:11pt; font-weight:600;">Converseenをフォロー:</span></p></body></html></translation>
</message>
<message>
- <source><html><head/><body><p align="center"><span style=" font-weight:600;">If you appreciate this work and would like to support the project, you are welcome to donate via PayPal or Flattr</span></p></body></html></source>
- <translation type="vanished"><html><head/><body><p align="center"><span style=" font-weight:600;">このアプリが気に入ったらプロジェクトをサポートするための PayPal や Flattr での寄付を歓迎します</span></p></body></html></translation>
- </message>
- <message>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -250,15 +246,15 @@
</message>
<message>
<source>Check all</source>
- <translation>すべてチェック</translation>
+ <translation>全てチェック</translation>
</message>
<message>
<source>Uncheck</source>
- <translation>チェックをはずす</translation>
+ <translation>チェックを外す</translation>
</message>
<message>
<source>Uncheck all</source>
- <translation>すべてのチェックをはずす</translation>
+ <translation>全てチェックを外す</translation>
</message>
<message>
<source>Import multipage document</source>
@@ -273,7 +269,7 @@
</message>
<message>
<source>Please, restart Converseen to apply current language!</source>
- <translation>変更した言語を適用するために再起動!</translation>
+ <translation>言語の変更を適用するためにConverseenを再起動してください!</translation>
</message>
<message>
<source>Cancel</source>
@@ -301,19 +297,19 @@
</message>
<message>
<source>As&k first</source>
- <translation type="unfinished"></translation>
+ <translation>最初に確認する(&K)</translation>
</message>
<message>
<source>O&verwrite all existing images</source>
- <translation type="unfinished"></translation>
+ <translation>既存のイメージを全て上書きする(&O)</translation>
</message>
<message>
<source>Updates</source>
- <translation type="unfinished"></translation>
+ <translation>アップデート</translation>
</message>
<message>
<source>Checks for updates automatically</source>
- <translation type="unfinished"></translation>
+ <translation>アップデートを自動的に確認する</translation>
</message>
</context>
<context>
@@ -324,11 +320,11 @@
</message>
<message>
<source>Png compression level</source>
- <translation>Png圧縮レベル</translation>
+ <translation>PNG圧縮レベル</translation>
</message>
<message>
<source>Jpeg compression level</source>
- <translation>Jpeg圧縮レベル</translation>
+ <translation>JPEG圧縮レベル</translation>
</message>
<message>
<source>Quality 0 - 100:</source>
@@ -355,23 +351,23 @@
<name>DialogShowUpdateMsg</name>
<message>
<source>Dialog</source>
- <translation type="unfinished"></translation>
+ <translation>ダイアログ</translation>
</message>
<message>
<source>TextLabel</source>
- <translation type="unfinished"></translation>
+ <translation>テキストラベル</translation>
</message>
<message>
<source>Don't show again</source>
- <translation type="unfinished"></translation>
+ <translation>今後表示しない</translation>
</message>
<message>
<source>Update Now</source>
- <translation type="unfinished"></translation>
+ <translation>今すぐアップデート</translation>
</message>
<message>
<source>Not Now</source>
- <translation type="unfinished"></translation>
+ <translation>今はしない</translation>
</message>
</context>
<context>
@@ -420,10 +416,6 @@
<translation>ヘルプ(&H)</translation>
</message>
<message>
- <source>180°</source>
- <translation type="vanished">180°</translation>
- </message>
- <message>
<source>Check selected items</source>
<translation>選択したアイテムをチェック</translation>
</message>
@@ -500,18 +492,6 @@
<translation>水平</translation>
</message>
<message>
- <source>+ 90°</source>
- <translation type="vanished">+ 90°</translation>
- </message>
- <message>
- <source>- 90°</source>
- <translation type="vanished">- 90°</translation>
- </message>
- <message>
- <source>Actions Panel</source>
- <translation type="obsolete">操作パネル</translation>
- </message>
- <message>
<source>Open output directory</source>
<translation>出力ディレクトリーを開く</translation>
</message>
@@ -565,7 +545,7 @@
</message>
<message>
<source>Check all items</source>
- <translation>すべてチェック</translation>
+ <translation>全てチェック</translation>
</message>
<message>
<source>Start with:</source>
@@ -577,7 +557,7 @@
</message>
<message>
<source>Overwrite all</source>
- <translation>すべて上書き</translation>
+ <translation>全て上書き</translation>
</message>
<message>
<source>Flip image:</source>
@@ -633,7 +613,7 @@
</message>
<message>
<source>Check a&ll</source>
- <translation>すべてチェック(&l)</translation>
+ <translation>全てチェック(&L)</translation>
</message>
<message>
<source>&Convert</source>
@@ -693,7 +673,7 @@
</message>
<message>
<source>Remove &all</source>
- <translation>全て削除(&a)</translation>
+ <translation>全て削除(&A)</translation>
</message>
<message>
<source>Dimensions</source>
@@ -729,7 +709,7 @@
</message>
<message>
<source>Uncheck all &items</source>
- <translation>すべてチェックを外す(&i)</translation>
+ <translation>全てチェックを外す(&I)</translation>
</message>
<message>
<source>Rotate and flip</source>
@@ -769,55 +749,51 @@
</message>
<message>
<source>Import windows icon (*.ico)</source>
- <translation>Windows アイコン (*.ico)のインポート</translation>
+ <translation>Windowsアイコン (*.ico) のインポート</translation>
</message>
<message>
<source>Import windows icon (*.ico *.icon)</source>
<translation>Windowsアイコン (*.ico *.icon)</translation>
</message>
<message>
- <source>Donate via Flattr</source>
- <translation type="vanished">Flattr で寄付</translation>
- </message>
- <message>
<source>Prefi&x/Suffix</source>
- <translation type="unfinished"></translation>
+ <translation>接頭辞/接尾辞(&X)</translation>
</message>
<message>
<source>Progressi&ve Number</source>
- <translation type="unfinished"></translation>
+ <translation>連番(&V)</translation>
</message>
<message>
<source>&Donate via Paypal</source>
- <translation type="unfinished"></translation>
+ <translation>Paypalで寄付(&D)</translation>
</message>
<message>
<source>&Report bug...</source>
- <translation type="unfinished"></translation>
+ <translation>バグを報告(&R)...</translation>
</message>
<message>
<source>Check if a new version of Converseen is available</source>
- <translation type="unfinished"></translation>
+ <translation>Converseenの新しいバージョンが利用可能か確認する</translation>
</message>
<message>
<source>&Check for updates</source>
- <translation type="unfinished"></translation>
+ <translation>アップデートを確認(&C)</translation>
</message>
<message>
<source>Actio&ns Panel</source>
- <translation type="unfinished"></translation>
+ <translation>動作パネル(&N)</translation>
</message>
<message>
<source>+ &90°</source>
- <translation type="unfinished"></translation>
+ <translation>+ 90°(&9)</translation>
</message>
<message>
<source>- 9&0°</source>
- <translation type="unfinished">- 90° {9&0°?}</translation>
+ <translation>- 90°(&0)</translation>
</message>
<message>
<source>&180°</source>
- <translation type="unfinished"></translation>
+ <translation>180°(&1)</translation>
</message>
</context>
<context>
@@ -969,7 +945,8 @@
<message>
<source>A new version of %1 is available!
Would you download it?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">%1 の新しいバージョンが利用可能です!
+ダウンロードしますか?</translation>
</message>
</context>
<context>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_pl_PL.ts new/converseen-0.9.7.2/loc/converseen_pl_PL.ts
--- old/converseen-0.9.7.1/loc/converseen_pl_PL.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_pl_PL.ts 2018-10-24 01:43:22.080056903 +0200
@@ -218,10 +218,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source><html><head/><body><p align="center"><span style=" font-weight:600;">If you appreciate this work and would like to support the project, you are welcome to donate via PayPal or Flattr</span></p></body></html></source>
- <translation type="vanished"><html><head/><body><p align="center"><span style=" font-weight:600;">Jeżeli podoba Ci się program i chciałbyś go wspomóc, zapraszmy do wpłacenia darowizny po przez Paypal lub Flattr</span></p></body></html></translation>
- </message>
- <message>
<location filename="../ui/dialoginfo.ui" line="53"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -524,10 +520,6 @@
<translation>&Pomoc</translation>
</message>
<message>
- <source>Actions Panel</source>
- <translation type="obsolete">Panel operacji</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="247"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -688,18 +680,6 @@
<translation>Nie obracaj</translation>
</message>
<message>
- <source>+ 90°</source>
- <translation type="vanished">W prawo o 90°</translation>
- </message>
- <message>
- <source>- 90°</source>
- <translation type="vanished">W lewo o 90°</translation>
- </message>
- <message>
- <source>180°</source>
- <translation type="vanished">o 180°</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="856"/>
<source>Flip image:</source>
<translation>Odbij obraz:</translation>
@@ -989,10 +969,6 @@
<source>Import windows icon (*.ico *.icon)</source>
<translation>Importuj ikonę windows (*.ico *.icon)</translation>
</message>
- <message>
- <source>Donate via Flattr</source>
- <translation type="vanished">Dotacje poprzez Flattr</translation>
- </message>
</context>
<context>
<name>MainWindowImpl</name>
@@ -1082,22 +1058,22 @@
<translation>Podgląd</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="933"/>
+ <location filename="../src/mainwindowimpl.cpp" line="935"/>
<source>Suggest a new name!</source>
<translation>Podaj nową nazwę!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="934"/>
+ <location filename="../src/mainwindowimpl.cpp" line="936"/>
<source>New name:</source>
<translation>Nowa nazwa:</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="939"/>
+ <location filename="../src/mainwindowimpl.cpp" line="941"/>
<source>Please, specify a name!</source>
<translation>Proszę utworzyć nazwę!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="940"/>
+ <location filename="../src/mainwindowimpl.cpp" line="942"/>
<source>You should specify a name.
Click Retry to specify a new name.
Click Ignore to cancel this operation.
@@ -1108,23 +1084,23 @@
Kliknij Porzuć, aby zakończyć wszystkie operacje.</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="955"/>
- <location filename="../src/mainwindowimpl.cpp" line="960"/>
+ <location filename="../src/mainwindowimpl.cpp" line="957"/>
+ <location filename="../src/mainwindowimpl.cpp" line="962"/>
<source>Warning!</source>
<translation>Ostrzeżenie!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="956"/>
+ <location filename="../src/mainwindowimpl.cpp" line="958"/>
<source>The filename should not be empty!</source>
<translation>Nazwa pliku nie może być pusta!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="961"/>
+ <location filename="../src/mainwindowimpl.cpp" line="963"/>
<source>The name chosen is identical to the initial one. Do you want to overwrite the original file?</source>
<translation>Wybrano taką samą nazwę, jak istniejąca już. Nadpisać orgyinalny plik?</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="977"/>
+ <location filename="../src/mainwindowimpl.cpp" line="979"/>
<source>Aborted!</source>
<translation>Przerwano!</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_pt_BR.ts new/converseen-0.9.7.2/loc/converseen_pt_BR.ts
--- old/converseen-0.9.7.1/loc/converseen_pt_BR.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_pt_BR.ts 2018-10-24 01:43:22.080056903 +0200
@@ -204,22 +204,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source><html><head/><body><p align="center"><span style=" font-weight:600;">If you appreciate this work and would like to support the project, you are welcome to donate via PayPal or Flattr</span></p></body></html></source>
- <translation type="vanished"><html><head/><body><p align="center"><span style=" font-weight:600;">Se você aprecia este trabalho e gostaria de apoiar o projeto, está convidado a doar via Paypal ou Flattr</span></p></body></html></translation>
- </message>
- <message>
- <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2';">(c) 2009 - 2017 Francesco Mondello GNU - GPL v.3</span></p></body></html></source>
- <translation type="vanished"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2';">(c) 2009 - 2017 Francesco Mondello GNU - GPL v.3</span></p></body></html></translation>
- </message>
- <message>
<location filename="../ui/dialoginfo.ui" line="291"/>
<source><html><head/><body><p><span style=" font-size:11pt; font-weight:600;">Follow Converseen:</span></p></body></html></source>
<translation><html><head/><body><p><span style=" font-size:11pt; font-weight:600;">Seguir Converseen:</span></p></body></html></translation>
@@ -530,10 +514,6 @@
<translation>A&juda</translation>
</message>
<message>
- <source>Actions Panel</source>
- <translation type="vanished">Ações do Painel</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="247"/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
@@ -729,18 +709,6 @@
<translation>Não girar</translation>
</message>
<message>
- <source>+ 90°</source>
- <translation type="vanished">+ 90°</translation>
- </message>
- <message>
- <source>- 90°</source>
- <translation type="vanished">- 90°</translation>
- </message>
- <message>
- <source>180°</source>
- <translation type="vanished">180°</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="856"/>
<source>Flip image:</source>
<translation>Inverter a imagem:</translation>
@@ -981,10 +949,6 @@
<translation>&Relatar erro...</translation>
</message>
<message>
- <source>&Flattr This!</source>
- <translation type="vanished">&Flattr Isto!</translation>
- </message>
- <message>
<location filename="../ui/mainwindow.ui" line="1314"/>
<source>&Check for updates</source>
<translation>&Verificar por atualizações</translation>
@@ -1009,10 +973,6 @@
<source>Import windows icon (*.ico *.icon)</source>
<translation>Importar ícones do Windows (*.ico *.icon)</translation>
</message>
- <message>
- <source>Donate via Flattr</source>
- <translation type="vanished">Doar via Paypal</translation>
- </message>
</context>
<context>
<name>MainWindowImpl</name>
@@ -1092,22 +1052,22 @@
<translation>Preview</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="933"/>
+ <location filename="../src/mainwindowimpl.cpp" line="935"/>
<source>Suggest a new name!</source>
<translation>Sugerir um novo nome!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="934"/>
+ <location filename="../src/mainwindowimpl.cpp" line="936"/>
<source>New name:</source>
<translation>Novo nome:</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="939"/>
+ <location filename="../src/mainwindowimpl.cpp" line="941"/>
<source>Please, specify a name!</source>
<translation>Por favor, especifique um nome!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="940"/>
+ <location filename="../src/mainwindowimpl.cpp" line="942"/>
<source>You should specify a name.
Click Retry to specify a new name.
Click Ignore to cancel this operation.
@@ -1118,23 +1078,23 @@
Clique em Abortar para cancelar todas as operações.</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="955"/>
- <location filename="../src/mainwindowimpl.cpp" line="960"/>
+ <location filename="../src/mainwindowimpl.cpp" line="957"/>
+ <location filename="../src/mainwindowimpl.cpp" line="962"/>
<source>Warning!</source>
<translation>Aviso!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="956"/>
+ <location filename="../src/mainwindowimpl.cpp" line="958"/>
<source>The filename should not be empty!</source>
<translation>O nome do arquivo não deve ser vazio!</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="961"/>
+ <location filename="../src/mainwindowimpl.cpp" line="963"/>
<source>The name chosen is identical to the initial one. Do you want to overwrite the original file?</source>
<translation>O nome escolhido é idêntico ao inicial. Você deseja substituir o arquivo original?</translation>
</message>
<message>
- <location filename="../src/mainwindowimpl.cpp" line="977"/>
+ <location filename="../src/mainwindowimpl.cpp" line="979"/>
<source>Aborted!</source>
<translation>Cancelado!</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_ru_RU.ts new/converseen-0.9.7.2/loc/converseen_ru_RU.ts
--- old/converseen-0.9.7.1/loc/converseen_ru_RU.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_ru_RU.ts 2018-10-24 01:43:22.080056903 +0200
@@ -427,10 +427,6 @@
<translation>#_копия</translation>
</message>
<message>
- <source>Actions Panel</source>
- <translation type="obsolete">Панель действий</translation>
- </message>
- <message>
<source>Open output directory</source>
<translation>Открыть папку назначения</translation>
</message>
@@ -723,19 +719,6 @@
<translation>Не вращать</translation>
</message>
<message>
- <source>+ 90°</source>
- <translation type="vanished">+ 90°</translation>
- </message>
- <message>
- <source>- 90°</source>
- <translation type="vanished">- 90°</translation>
- </message>
- <message>
- <source>180°</source>
- <translatorcomment>180°</translatorcomment>
- <translation type="vanished">180°</translation>
- </message>
- <message>
<source>Flip image:</source>
<translation>Отразить изображение:</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_tr_TR.ts new/converseen-0.9.7.2/loc/converseen_tr_TR.ts
--- old/converseen-0.9.7.1/loc/converseen_tr_TR.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_tr_TR.ts 2018-10-24 01:43:22.080056903 +0200
@@ -444,10 +444,6 @@
<translation>#_kopyala</translation>
</message>
<message>
- <source>Actions Panel</source>
- <translation type="obsolete">Eylemler Paneli</translation>
- </message>
- <message>
<source>Open output directory</source>
<translation>Çıktı dizinini aç</translation>
</message>
@@ -724,10 +720,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>180°</source>
- <translation type="obsolete">180°</translation>
- </message>
- <message>
<source>Flip image:</source>
<translation type="unfinished"></translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/loc/converseen_uk_UA.ts new/converseen-0.9.7.2/loc/converseen_uk_UA.ts
--- old/converseen-0.9.7.1/loc/converseen_uk_UA.ts 2018-10-11 17:38:12.058837780 +0200
+++ new/converseen-0.9.7.2/loc/converseen_uk_UA.ts 2018-10-24 01:43:22.080056903 +0200
@@ -175,22 +175,6 @@
<translation><strong>Переклад на польську мову: </strong>Michał Olber from OSWorld.pl — <a href="mailto:redakcja@osworld.pl">redakcja@osworld.pl</a></translation>
</message>
<message>
- <source><html><head/><body><p align="center"><span style=" font-weight:600;">If you appreciate this work and would like to support the project, you are welcome to donate via PayPal or Flattr</span></p></body></html></source>
- <translation type="vanished"><html><head/><body><p align="center"><span style=" font-weight:600;">Якщо Ви цінуєте цю роботу та бажаєте підтримати проект, Ви можете пожертвувати нам через Paypal чи Flattr</span></p></body></html></translation>
- </message>
- <message>
- <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2';">(c) 2009 - 2017 Francesco Mondello GNU - GPL v.3</span></p></body></html></source>
- <translation type="vanished"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2';">(c) 2009 - 2017 Франческо Монделло GNU - GPL вер.3</span></p></body></html></translation>
- </message>
- <message>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -453,10 +437,6 @@
<translation>#_копія</translation>
</message>
<message>
- <source>Actions Panel</source>
- <translation type="vanished">Смужка дій</translation>
- </message>
- <message>
<source>Open output directory</source>
<translation>Відкрити теку призначення</translation>
</message>
@@ -749,19 +729,6 @@
<translation>Не обертати</translation>
</message>
<message>
- <source>+ 90°</source>
- <translation type="vanished">+ 90°</translation>
- </message>
- <message>
- <source>- 90°</source>
- <translation type="vanished">- 90°</translation>
- </message>
- <message>
- <source>180°</source>
- <translatorcomment>180°</translatorcomment>
- <translation type="vanished">180°</translation>
- </message>
- <message>
<source>Flip image:</source>
<translation>Перевернути зображення:</translation>
</message>
@@ -798,10 +765,6 @@
<translation>Імпортувати іконку windows (*.ico *.icon)</translation>
</message>
<message>
- <source>Donate via Flattr</source>
- <translation type="vanished">Пожертвувати через Flattr</translation>
- </message>
- <message>
<source>Prefi&x/Suffix</source>
<translation>Префі&кс/Суфікс</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/src/globals.cpp new/converseen-0.9.7.2/src/globals.cpp
--- old/converseen-0.9.7.1/src/globals.cpp 2018-10-11 17:38:12.065504757 +0200
+++ new/converseen-0.9.7.2/src/globals.cpp 2018-10-24 01:43:22.083390253 +0200
@@ -2,7 +2,7 @@
* This file is part of Kawaii Emoji Messenger, a multiplatform Facebook client
* based on the idea of bringing emoji on desktop.
*
-* (C) Francesco Mondello 2014
+* (C) Francesco Mondello 2009 - 2018
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/src/globals.h new/converseen-0.9.7.2/src/globals.h
--- old/converseen-0.9.7.1/src/globals.h 2018-10-11 17:38:12.065504757 +0200
+++ new/converseen-0.9.7.2/src/globals.h 2018-10-24 01:43:22.083390253 +0200
@@ -41,8 +41,8 @@
namespace globals
{
const QString PROGRAM_NAME = "Converseen";
- const int CURRENT_INTERNAL_VERSION = 971;
- const QString VERSION = "0.9.7.1";
+ const int CURRENT_INTERNAL_VERSION = 972;
+ const QString VERSION = "0.9.7.2";
class Globals
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/converseen-0.9.7.1/src/mainwindowimpl.cpp new/converseen-0.9.7.2/src/mainwindowimpl.cpp
--- old/converseen-0.9.7.1/src/mainwindowimpl.cpp 2018-10-11 17:38:12.065504757 +0200
+++ new/converseen-0.9.7.2/src/mainwindowimpl.cpp 2018-10-24 01:43:22.083390253 +0200
@@ -896,12 +896,14 @@
int currentVersion = globals::CURRENT_INTERNAL_VERSION;
if (savedVersion < currentVersion) {
- QString appVersion;
+#if defined(Q_OS_WIN)
+ // Open thank you page on Windows
+ QString welcomePage = QString("http://converseen.fasterland.net/thank/");
- /*QString welcomePage = QString("http://converseen.fasterland.net/thank/");
+ QDesktopServices::openUrl(QUrl(welcomePage, QUrl::TolerantMode));
+#endif
- QDesktopServices::openUrl(QUrl(welcomePage, QUrl::TolerantMode));*/
- IniSettings::setCurrentVersion(currentVersion);
+ IniSettings::setCurrentVersion(currentVersion);
}
}
1
0
Hello community,
here is the log from the commit of package python-flake8-bugbear for openSUSE:Factory checked in at 2018-11-06 14:37:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-flake8-bugbear (Old)
and /work/SRC/openSUSE:Factory/.python-flake8-bugbear.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-flake8-bugbear"
Tue Nov 6 14:37:33 2018 rev:3 rq:646250 version:18.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-flake8-bugbear/python-flake8-bugbear.changes 2018-07-18 22:58:04.850136914 +0200
+++ /work/SRC/openSUSE:Factory/.python-flake8-bugbear.new/python-flake8-bugbear.changes 2018-11-06 14:38:24.120685500 +0100
@@ -1,0 +2,13 @@
+Fri Nov 2 21:34:53 UTC 2018 - Matej Cepl <mcepl(a)suse.com>
+
+- Update to 18.8.0:
+ * Exclude immutable calls like tuple() and frozenset() from B008
+ * Examine kw-only args for mutable defaults
+ * Black all the .py files - Like one should (#48)
+ * Add testing and document support for the Python 3.7 release
+ * Avoid adding the visitor as an __init__ parameter (Fixes #39)
+ (#40)
+ * Add trove classifier 'Programming Language :: Python :: 3 :: Only'
+ * Fix pathlib link in readme (#36)
+
+-------------------------------------------------------------------
Old:
----
flake8-bugbear-18.2.0.tar.gz
New:
----
flake8-bugbear-18.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-flake8-bugbear.spec ++++++
--- /var/tmp/diff_new_pack.040Db7/_old 2018-11-06 14:38:25.888682828 +0100
+++ /var/tmp/diff_new_pack.040Db7/_new 2018-11-06 14:38:25.892682821 +0100
@@ -12,26 +12,27 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-flake8-bugbear
-Version: 18.2.0
+Version: 18.8.0
Release: 0
Summary: A plugin for flake8 finding likely bugs and design problems in your program
License: MIT
Group: Development/Languages/Python
-Url: https://github.com/PyCQA/flake8-bugbear
+URL: https://github.com/PyCQA/flake8-bugbear
Source: https://files.pythonhosted.org/packages/source/f/flake8-bugbear/flake8-bugb…
-BuildRequires: %{python_module base >= 3.5}
+BuildRequires: %{python_module attrs}
+BuildRequires: %{python_module base}
+BuildRequires: %{python_module flake8 >= 3.0.0}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildArch: noarch
-
%python_subpackages
%description
@@ -49,6 +50,9 @@
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%check
+%python_exec setup.py test
+
%files %{python_files}
%{python_sitelib}/*
++++++ flake8-bugbear-18.2.0.tar.gz -> flake8-bugbear-18.8.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/PKG-INFO new/flake8-bugbear-18.8.0/PKG-INFO
--- old/flake8-bugbear-18.2.0/PKG-INFO 2018-02-05 14:13:59.000000000 +0100
+++ new/flake8-bugbear-18.8.0/PKG-INFO 2018-08-14 00:14:42.000000000 +0200
@@ -1,12 +1,11 @@
Metadata-Version: 1.2
Name: flake8-bugbear
-Version: 18.2.0
+Version: 18.8.0
Summary: A plugin for flake8 finding likely bugs and design problems in your program. Contains warnings that don't belong in pyflakes and pycodestyle.
Home-page: https://github.com/PyCQA/flake8-bugbear
Author: Łukasz Langa
Author-email: lukasz(a)langa.pl
License: MIT
-Description-Content-Type: UNKNOWN
Description: ==============
flake8-bugbear
==============
@@ -14,6 +13,9 @@
.. image:: https://travis-ci.org/PyCQA/flake8-bugbear.svg?branch=master
:target: https://travis-ci.org/PyCQA/flake8-bugbear
+ .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+ :target: https://github.com/ambv/black
+
A plugin for Flake8 finding likely bugs and design problems in your
program. Contains warnings that don't belong in pyflakes and
pycodestyle::
@@ -29,6 +31,22 @@
3. A fearsome imaginary creature, especially one evoked to frighten
children.
+ Installation
+ ------------
+
+ Install from ``pip`` with:
+
+ .. code-block:: sh
+
+ pip install flake8-bugbear
+
+ It will then automatically be run as part of ``flake8``; you can check it has
+ been picked up with:
+
+ .. code-block:: sh
+
+ $ flake8 --version
+ 3.5.0 (assertive: 1.0.1, flake8-bugbear: 18.2.0, flake8-comprehensions: 1.4.1, mccabe: 0.6.1, pycodestyle: 2.3.1, pyflakes: 1.6.0) CPython 3.7.0 on Darwin
List of warnings
----------------
@@ -195,12 +213,12 @@
If you're still invested in Python 2, there might be a small subset of
deprecated syntax that you'd have to abandon... but you're already doing
- that, right? `six <https://pypi.python.org/pypi/six>`_ or
- `python-future <https://pypi.python.org/pypi/future>`_ bridge the gaps.
+ that, right? `six <https://pypi.org/project/six/>`_ or
+ `python-future <https://pypi.org/project/future/>`_ bridge the gaps.
By making the code exclusively Python 3.5+, I'm able to focus on the
quality of the checks and re-use all the nice features of the new
- releases (check out `pathlib <docs.python.org/3/library/pathlib.html>`_)
+ releases (check out `pathlib <https://docs.python.org/3/library/pathlib.html>`_)
instead of wasting cycles on Unicode compatibility, etc.
@@ -353,8 +371,8 @@
Glued together by `Łukasz Langa <mailto:lukasz@langa.pl>`_. Multiple
improvements by `Markus Unterwaditzer <mailto:markus@unterwaditzer.net>`_,
- `Martijn Pieters <mailto:github.com@zopatista.com>`_, and
- `Cooper Lees <mailto:me@cooperlees.com>`_.
+ `Martijn Pieters <mailto:github.com@zopatista.com>`_,
+ `Cooper Lees <mailto:me@cooperlees.com>`_, and `Ryan May <mailto:rmay31@gmail.com>`.
Keywords: flake8 bugbear bugs pyflakes pylint linter qa
Platform: UNKNOWN
@@ -368,6 +386,8 @@
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Topic :: Software Development :: Libraries :: Python Modules
Classifier: Topic :: Software Development :: Quality Assurance
Requires-Python: >=3.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/README.rst new/flake8-bugbear-18.8.0/README.rst
--- old/flake8-bugbear-18.2.0/README.rst 2018-02-05 14:08:40.000000000 +0100
+++ new/flake8-bugbear-18.8.0/README.rst 2018-08-13 23:47:30.000000000 +0200
@@ -5,6 +5,9 @@
.. image:: https://travis-ci.org/PyCQA/flake8-bugbear.svg?branch=master
:target: https://travis-ci.org/PyCQA/flake8-bugbear
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+ :target: https://github.com/ambv/black
+
A plugin for Flake8 finding likely bugs and design problems in your
program. Contains warnings that don't belong in pyflakes and
pycodestyle::
@@ -20,6 +23,22 @@
3. A fearsome imaginary creature, especially one evoked to frighten
children.
+Installation
+------------
+
+Install from ``pip`` with:
+
+.. code-block:: sh
+
+ pip install flake8-bugbear
+
+It will then automatically be run as part of ``flake8``; you can check it has
+been picked up with:
+
+.. code-block:: sh
+
+ $ flake8 --version
+ 3.5.0 (assertive: 1.0.1, flake8-bugbear: 18.2.0, flake8-comprehensions: 1.4.1, mccabe: 0.6.1, pycodestyle: 2.3.1, pyflakes: 1.6.0) CPython 3.7.0 on Darwin
List of warnings
----------------
@@ -186,12 +205,12 @@
If you're still invested in Python 2, there might be a small subset of
deprecated syntax that you'd have to abandon... but you're already doing
-that, right? `six <https://pypi.python.org/pypi/six>`_ or
-`python-future <https://pypi.python.org/pypi/future>`_ bridge the gaps.
+that, right? `six <https://pypi.org/project/six/>`_ or
+`python-future <https://pypi.org/project/future/>`_ bridge the gaps.
By making the code exclusively Python 3.5+, I'm able to focus on the
quality of the checks and re-use all the nice features of the new
-releases (check out `pathlib <docs.python.org/3/library/pathlib.html>`_)
+releases (check out `pathlib <https://docs.python.org/3/library/pathlib.html>`_)
instead of wasting cycles on Unicode compatibility, etc.
@@ -344,5 +363,5 @@
Glued together by `Łukasz Langa <mailto:lukasz@langa.pl>`_. Multiple
improvements by `Markus Unterwaditzer <mailto:markus@unterwaditzer.net>`_,
-`Martijn Pieters <mailto:github.com@zopatista.com>`_, and
-`Cooper Lees <mailto:me@cooperlees.com>`_.
+`Martijn Pieters <mailto:github.com@zopatista.com>`_,
+`Cooper Lees <mailto:me@cooperlees.com>`_, and `Ryan May <mailto:rmay31@gmail.com>`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/bugbear.py new/flake8-bugbear-18.8.0/bugbear.py
--- old/flake8-bugbear-18.2.0/bugbear.py 2018-02-05 14:13:34.000000000 +0100
+++ new/flake8-bugbear-18.8.0/bugbear.py 2018-08-14 00:13:47.000000000 +0200
@@ -10,30 +10,27 @@
import pycodestyle
-__version__ = '18.2.0'
+__version__ = "18.8.0"
-LOG = logging.getLogger('flake8.bugbear')
+LOG = logging.getLogger("flake8.bugbear")
@attr.s(hash=False)
class BugBearChecker:
- name = 'flake8-bugbear'
+ name = "flake8-bugbear"
version = __version__
tree = attr.ib(default=None)
- filename = attr.ib(default='(none)')
+ filename = attr.ib(default="(none)")
lines = attr.ib(default=None)
max_line_length = attr.ib(default=79)
- visitor = attr.ib(default=attr.Factory(lambda: BugBearVisitor))
+ visitor = attr.ib(init=False, default=attr.Factory(lambda: BugBearVisitor))
options = attr.ib(default=None)
def run(self):
if not self.tree or not self.lines:
self.load_file()
- visitor = self.visitor(
- filename=self.filename,
- lines=self.lines,
- )
+ visitor = self.visitor(filename=self.filename, lines=self.lines)
visitor.visit(self.tree)
for e in itertools.chain(visitor.errors, self.gen_line_based_checks()):
if pycodestyle.noqa(self.lines[e.lineno - 1]):
@@ -50,11 +47,7 @@
for lineno, line in enumerate(self.lines, start=1):
length = len(line) - 1
if length > 1.1 * self.max_line_length:
- yield B950(
- lineno,
- length,
- vars=(length, self.max_line_length),
- )
+ yield B950(lineno, length, vars=(length, self.max_line_length))
@classmethod
def adapt_error(cls, e):
@@ -94,14 +87,13 @@
As documented in the README, the user is expected to explicitly select
the warnings.
"""
- if code[:2] != 'B9':
+ if code[:2] != "B9":
# Normal warnings are safe for emission.
return True
if self.options is None:
LOG.info(
- "Options not provided to Bugbear, optional warning %s selected.",
- code,
+ "Options not provided to Bugbear, optional warning %s selected.", code
)
return True
@@ -145,75 +137,59 @@
def visit_ExceptHandler(self, node):
if node.type is None:
- self.errors.append(
- B001(node.lineno, node.col_offset)
- )
+ self.errors.append(B001(node.lineno, node.col_offset))
self.generic_visit(node)
def visit_UAdd(self, node):
trailing_nodes = list(map(type, self.node_window[-4:]))
if trailing_nodes == [ast.UnaryOp, ast.UAdd, ast.UnaryOp, ast.UAdd]:
originator = self.node_window[-4]
- self.errors.append(
- B002(originator.lineno, originator.col_offset)
- )
+ self.errors.append(B002(originator.lineno, originator.col_offset))
self.generic_visit(node)
def visit_Call(self, node):
if isinstance(node.func, ast.Attribute):
for bug in (B301, B302, B305):
if node.func.attr in bug.methods:
- call_path = '.'.join(self.compose_call_path(node.func.value))
+ call_path = ".".join(self.compose_call_path(node.func.value))
if call_path not in bug.valid_paths:
- self.errors.append(
- bug(node.lineno, node.col_offset)
- )
+ self.errors.append(bug(node.lineno, node.col_offset))
break
else:
self.check_for_b005(node)
else:
with suppress(AttributeError, IndexError):
if (
- node.func.id in ('getattr', 'hasattr') and
- node.args[1].s == '__call__'
+ node.func.id in ("getattr", "hasattr")
+ and node.args[1].s == "__call__" # noqa: W503
):
- self.errors.append(
- B004(node.lineno, node.col_offset)
- )
+ self.errors.append(B004(node.lineno, node.col_offset))
self.generic_visit(node)
def visit_Attribute(self, node):
call_path = list(self.compose_call_path(node))
- if '.'.join(call_path) == 'sys.maxint':
- self.errors.append(
- B304(node.lineno, node.col_offset)
- )
- elif len(call_path) == 2 and call_path[1] == 'message':
+ if ".".join(call_path) == "sys.maxint":
+ self.errors.append(B304(node.lineno, node.col_offset))
+ elif len(call_path) == 2 and call_path[1] == "message":
name = call_path[0]
for elem in reversed(self.node_stack[:-1]):
if isinstance(elem, ast.ExceptHandler) and elem.name == name:
- self.errors.append(
- B306(node.lineno, node.col_offset)
- )
+ self.errors.append(B306(node.lineno, node.col_offset))
break
def visit_Assign(self, node):
if isinstance(self.node_stack[-2], ast.ClassDef):
# note: by hasattr below we're ignoring starred arguments, slices
# and tuples for simplicity.
- assign_targets = {t.id for t in node.targets if hasattr(t, 'id')}
- if '__metaclass__' in assign_targets:
- self.errors.append(
- B303(node.lineno, node.col_offset)
- )
+ assign_targets = {t.id for t in node.targets if hasattr(t, "id")}
+ if "__metaclass__" in assign_targets:
+ self.errors.append(B303(node.lineno, node.col_offset))
elif len(node.targets) == 1:
t = node.targets[0]
if isinstance(t, ast.Attribute) and isinstance(t.value, ast.Name):
- if (t.value.id, t.attr) == ('os', 'environ'):
- self.errors.append(
- B003(node.lineno, node.col_offset)
- )
+ if (t.value.id, t.attr) == ("os", "environ"):
+ self.errors.append(B003(node.lineno, node.col_offset))
self.generic_visit(node)
def visit_For(self, node):
@@ -249,7 +225,7 @@
if len(node.args) != 1 or not isinstance(node.args[0], ast.Str):
return # used arguments don't match the builtin strip
- call_path = '.'.join(self.compose_call_path(node.func.value))
+ call_path = ".".join(self.compose_call_path(node.func.value))
if call_path in B005.valid_paths:
return # path is exempt
@@ -260,31 +236,23 @@
if len(s) == len(set(s)):
return # no characters appear more than once
- self.errors.append(
- B005(node.lineno, node.col_offset)
- )
+ self.errors.append(B005(node.lineno, node.col_offset))
def check_for_b006(self, node):
- for default in node.args.defaults:
+ for default in node.args.defaults + node.args.kw_defaults:
if isinstance(default, B006.mutable_literals):
- self.errors.append(
- B006(default.lineno, default.col_offset)
- )
+ self.errors.append(B006(default.lineno, default.col_offset))
elif isinstance(default, ast.Call):
- call_path = '.'.join(self.compose_call_path(default.func))
+ call_path = ".".join(self.compose_call_path(default.func))
if call_path in B006.mutable_calls:
- self.errors.append(
- B006(default.lineno, default.col_offset)
- )
+ self.errors.append(B006(default.lineno, default.col_offset))
else:
- self.errors.append(
- B008(default.lineno, default.col_offset)
- )
+ self.errors.append(B008(default.lineno, default.col_offset))
def check_for_b007(self, node):
targets = NameFinder()
targets.visit(node.target)
- ctrl_names = set(filter(lambda s: not s.startswith('_'), targets.names))
+ ctrl_names = set(filter(lambda s: not s.startswith("_"), targets.names))
body = NameFinder()
for expr in node.body:
body.visit(expr)
@@ -307,9 +275,7 @@
return_node = x
if has_yield and return_node is not None:
- self.errors.append(
- B901(return_node.lineno, return_node.col_offset)
- )
+ self.errors.append(B901(return_node.lineno, return_node.col_offset))
break
xs.extend(ast.iter_child_nodes(x))
@@ -321,35 +287,32 @@
decorators = NameFinder()
decorators.visit(node.decorator_list)
- if 'staticmethod' in decorators.names:
+ if "staticmethod" in decorators.names:
# TODO: maybe warn if the first argument is surprisingly `self` or
# `cls`?
return
- bases = {
- b.id
- for b in self.node_stack[-2].bases if isinstance(b, ast.Name)
- }
- if 'type' in bases:
+ bases = {b.id for b in self.node_stack[-2].bases if isinstance(b, ast.Name)}
+ if "type" in bases:
if (
- 'classmethod' in decorators.names or
- node.name in B902.implicit_classmethods
+ "classmethod" in decorators.names
+ or node.name in B902.implicit_classmethods # noqa: W503
):
expected_first_args = B902.metacls
- kind = 'metaclass class'
+ kind = "metaclass class"
else:
expected_first_args = B902.cls
- kind = 'metaclass instance'
+ kind = "metaclass instance"
else:
if (
- 'classmethod' in decorators.names or
- node.name in B902.implicit_classmethods
+ "classmethod" in decorators.names
+ or node.name in B902.implicit_classmethods # noqa: W503
):
expected_first_args = B902.cls
- kind = 'class'
+ kind = "class"
else:
expected_first_args = B902.self
- kind = 'instance'
+ kind = "instance"
args = node.args.args
vararg = node.args.vararg
@@ -361,47 +324,43 @@
lineno = args[0].lineno
col = args[0].col_offset
elif vararg:
- actual_first_arg = '*' + vararg.arg
+ actual_first_arg = "*" + vararg.arg
lineno = vararg.lineno
col = vararg.col_offset
elif kwarg:
- actual_first_arg = '**' + kwarg.arg
+ actual_first_arg = "**" + kwarg.arg
lineno = kwarg.lineno
col = kwarg.col_offset
elif kwonlyargs:
- actual_first_arg = '*, ' + kwonlyargs[0].arg
+ actual_first_arg = "*, " + kwonlyargs[0].arg
lineno = kwonlyargs[0].lineno
col = kwonlyargs[0].col_offset
else:
- actual_first_arg = '(none)'
+ actual_first_arg = "(none)"
lineno = node.lineno
col = node.col_offset
if actual_first_arg not in expected_first_args:
- if not actual_first_arg.startswith(('(', '*')):
+ if not actual_first_arg.startswith(("(", "*")):
actual_first_arg = repr(actual_first_arg)
self.errors.append(
- B902(
- lineno,
- col,
- vars=(actual_first_arg, kind, expected_first_args[0])
- )
+ B902(lineno, col, vars=(actual_first_arg, kind, expected_first_args[0]))
)
def check_for_b903(self, node):
body = node.body
if (
- body and
- isinstance(body[0], ast.Expr) and
- isinstance(body[0].value, ast.Str)
+ body
+ and isinstance(body[0], ast.Expr) # noqa: W503
+ and isinstance(body[0].value, ast.Str) # noqa: W503
):
# Ignore the docstring
body = body[1:]
if (
- len(body) != 1 or
- not isinstance(body[0], ast.FunctionDef) or
- body[0].name != '__init__'
+ len(body) != 1
+ or not isinstance(body[0], ast.FunctionDef) # noqa: W503
+ or body[0].name != "__init__" # noqa: W503
):
# only classes with *just* an __init__ method are interesting
return
@@ -416,8 +375,7 @@
if not isinstance(stmt.value, ast.Name):
return
- self.errors.append(
- B903(node.lineno, node.col_offset))
+ self.errors.append(B903(node.lineno, node.col_offset))
@attr.s
@@ -427,6 +385,7 @@
After `.visit(node)` is called, `found` is a dict with all name nodes inside,
key is name string, value is the node (useful for location purposes).
"""
+
names = attr.ib(default=attr.Factory(dict))
def visit_Name(self, node):
@@ -442,74 +401,74 @@
return node
-error = namedtuple('error', 'lineno col message type vars')
+error = namedtuple("error", "lineno col message type vars")
Error = partial(partial, error, type=BugBearChecker, vars=())
B001 = Error(
message="B001 Do not use bare `except:`, it also catches unexpected "
- "events like memory errors, interrupts, system exit, and so on. "
- "Prefer `except Exception:`. If you're sure what you're doing, "
- "be explicit and write `except BaseException:`.",
+ "events like memory errors, interrupts, system exit, and so on. "
+ "Prefer `except Exception:`. If you're sure what you're doing, "
+ "be explicit and write `except BaseException:`."
)
B002 = Error(
message="B002 Python does not support the unary prefix increment. Writing "
- "++n is equivalent to +(+(n)), which equals n. You meant n += 1.",
+ "++n is equivalent to +(+(n)), which equals n. You meant n += 1."
)
B003 = Error(
message="B003 Assigning to `os.environ` doesn't clear the environment. "
- "Subprocesses are going to see outdated variables, in disagreement "
- "with the current process. Use `os.environ.clear()` or the `env=` "
- "argument to Popen.",
+ "Subprocesses are going to see outdated variables, in disagreement "
+ "with the current process. Use `os.environ.clear()` or the `env=` "
+ "argument to Popen."
)
B004 = Error(
message="B004 Using `hasattr(x, '__call__')` to test if `x` is callable "
- "is unreliable. If `x` implements custom `__getattr__` or its "
- "`__call__` is itself not callable, you might get misleading "
- "results. Use `callable(x)` for consistent results.",
+ "is unreliable. If `x` implements custom `__getattr__` or its "
+ "`__call__` is itself not callable, you might get misleading "
+ "results. Use `callable(x)` for consistent results."
)
B005 = Error(
message="B005 Using .strip() with multi-character strings is misleading "
- "the reader. It looks like stripping a substring. Move your "
- "character set to a constant if this is deliberate. Use "
- ".replace() or regular expressions to remove string fragments.",
+ "the reader. It looks like stripping a substring. Move your "
+ "character set to a constant if this is deliberate. Use "
+ ".replace() or regular expressions to remove string fragments."
)
-B005.methods = {'lstrip', 'rstrip', 'strip'}
+B005.methods = {"lstrip", "rstrip", "strip"}
B005.valid_paths = {}
B006 = Error(
message="B006 Do not use mutable data structures for argument defaults. "
- "All calls reuse one instance of that data structure, persisting "
- "changes between them.",
+ "All calls reuse one instance of that data structure, persisting "
+ "changes between them."
)
B006.mutable_literals = (ast.Dict, ast.List, ast.Set)
B006.mutable_calls = {
- 'Counter',
- 'OrderedDict',
- 'collections.Counter',
- 'collections.OrderedDict',
- 'collections.defaultdict',
- 'collections.deque',
- 'defaultdict',
- 'deque',
- 'dict',
- 'list',
- 'set',
+ "Counter",
+ "OrderedDict",
+ "collections.Counter",
+ "collections.OrderedDict",
+ "collections.defaultdict",
+ "collections.deque",
+ "defaultdict",
+ "deque",
+ "dict",
+ "list",
+ "set",
}
B007 = Error(
message="B007 Loop control variable {!r} not used within the loop body. "
- "If this is intended, start the name with an underscore.",
+ "If this is intended, start the name with an underscore."
)
B008 = Error(
message="B008 Do not perform calls in argument defaults. The call is "
- "performed only once at function definition time. All calls to your "
- "function will reuse the result of that definition-time call. If "
- "this is intended, assign the function call to a module-level "
- "variable and use that variable as a default value.",
+ "performed only once at function definition time. All calls to your "
+ "function will reuse the result of that definition-time call. If "
+ "this is intended, assign the function call to a module-level "
+ "variable and use that variable as a default value."
)
@@ -517,70 +476,67 @@
# through if they're not.
B301 = Error(
message="B301 Python 3 does not include `.iter*` methods on dictionaries. "
- "Remove the `iter` prefix from the method name. For Python 2 "
- "compatibility, prefer the Python 3 equivalent unless you expect "
- "the size of the container to be large or unbounded. Then use "
- "`six.iter*` or `future.utils.iter*`.",
+ "Remove the `iter` prefix from the method name. For Python 2 "
+ "compatibility, prefer the Python 3 equivalent unless you expect "
+ "the size of the container to be large or unbounded. Then use "
+ "`six.iter*` or `future.utils.iter*`."
)
-B301.methods = {'iterkeys', 'itervalues', 'iteritems', 'iterlists'}
-B301.valid_paths = {'six', 'future.utils', 'builtins'}
+B301.methods = {"iterkeys", "itervalues", "iteritems", "iterlists"}
+B301.valid_paths = {"six", "future.utils", "builtins"}
B302 = Error(
message="B302 Python 3 does not include `.view*` methods on dictionaries. "
- "Remove the `view` prefix from the method name. For Python 2 "
- "compatibility, prefer the Python 3 equivalent unless you expect "
- "the size of the container to be large or unbounded. Then use "
- "`six.view*` or `future.utils.view*`.",
+ "Remove the `view` prefix from the method name. For Python 2 "
+ "compatibility, prefer the Python 3 equivalent unless you expect "
+ "the size of the container to be large or unbounded. Then use "
+ "`six.view*` or `future.utils.view*`."
)
-B302.methods = {'viewkeys', 'viewvalues', 'viewitems', 'viewlists'}
-B302.valid_paths = {'six', 'future.utils', 'builtins'}
+B302.methods = {"viewkeys", "viewvalues", "viewitems", "viewlists"}
+B302.valid_paths = {"six", "future.utils", "builtins"}
B303 = Error(
message="B303 `__metaclass__` does nothing on Python 3. Use "
- "`class MyClass(BaseClass, metaclass=...)`. For Python 2 "
- "compatibility, use `six.add_metaclass`.",
+ "`class MyClass(BaseClass, metaclass=...)`. For Python 2 "
+ "compatibility, use `six.add_metaclass`."
)
-B304 = Error(
- message="B304 `sys.maxint` is not a thing on Python 3. Use `sys.maxsize`.",
-)
+B304 = Error(message="B304 `sys.maxint` is not a thing on Python 3. Use `sys.maxsize`.")
B305 = Error(
message="B305 `.next()` is not a thing on Python 3. Use the `next()` "
- "builtin. For Python 2 compatibility, use `six.next()`.",
+ "builtin. For Python 2 compatibility, use `six.next()`."
)
-B305.methods = {'next'}
-B305.valid_paths = {'six', 'future.utils', 'builtins'}
+B305.methods = {"next"}
+B305.valid_paths = {"six", "future.utils", "builtins"}
B306 = Error(
message="B306 `BaseException.message` has been deprecated as of Python "
- "2.6 and is removed in Python 3. Use `str(e)` to access the "
- "user-readable message. Use `e.args` to access arguments passed "
- "to the exception.",
+ "2.6 and is removed in Python 3. Use `str(e)` to access the "
+ "user-readable message. Use `e.args` to access arguments passed "
+ "to the exception."
)
B901 = Error(
message="B901 Using `yield` together with `return x`. Use native "
- "`async def` coroutines or put a `# noqa` comment on this "
- "line if this was intentional.",
+ "`async def` coroutines or put a `# noqa` comment on this "
+ "line if this was intentional."
)
B902 = Error(
message="B902 Invalid first argument {} used for {} method. Use the "
- "canonical first argument name in methods, i.e. {}."
+ "canonical first argument name in methods, i.e. {}."
)
-B902.implicit_classmethods = {'__new__', '__init_subclass__'}
-B902.self = ['self'] # it's a list because the first is preferred
-B902.cls = ['cls', 'klass'] # ditto.
-B902.metacls = ['metacls', 'metaclass', 'typ'] # ditto.
+B902.implicit_classmethods = {"__new__", "__init_subclass__"}
+B902.self = ["self"] # it's a list because the first is preferred
+B902.cls = ["cls", "klass"] # ditto.
+B902.metacls = ["metacls", "metaclass", "typ"] # ditto.
B903 = Error(
message="B903 Data class should either be immutable or use __slots__ to "
- "save memory. Use collections.namedtuple to generate an immutable "
- "class, or enumerate the attributes in a __slot__ declaration in "
- "the class to leave attributes mutable.")
-
-B950 = Error(
- message='B950 line too long ({} > {} characters)',
+ "save memory. Use collections.namedtuple to generate an immutable "
+ "class, or enumerate the attributes in a __slot__ declaration in "
+ "the class to leave attributes mutable."
)
+B950 = Error(message="B950 line too long ({} > {} characters)")
+
disabled_by_default = ["B901", "B902", "B903", "B950"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/flake8_bugbear.egg-info/PKG-INFO new/flake8-bugbear-18.8.0/flake8_bugbear.egg-info/PKG-INFO
--- old/flake8-bugbear-18.2.0/flake8_bugbear.egg-info/PKG-INFO 2018-02-05 14:13:59.000000000 +0100
+++ new/flake8-bugbear-18.8.0/flake8_bugbear.egg-info/PKG-INFO 2018-08-14 00:14:42.000000000 +0200
@@ -1,12 +1,11 @@
Metadata-Version: 1.2
Name: flake8-bugbear
-Version: 18.2.0
+Version: 18.8.0
Summary: A plugin for flake8 finding likely bugs and design problems in your program. Contains warnings that don't belong in pyflakes and pycodestyle.
Home-page: https://github.com/PyCQA/flake8-bugbear
Author: Łukasz Langa
Author-email: lukasz(a)langa.pl
License: MIT
-Description-Content-Type: UNKNOWN
Description: ==============
flake8-bugbear
==============
@@ -14,6 +13,9 @@
.. image:: https://travis-ci.org/PyCQA/flake8-bugbear.svg?branch=master
:target: https://travis-ci.org/PyCQA/flake8-bugbear
+ .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+ :target: https://github.com/ambv/black
+
A plugin for Flake8 finding likely bugs and design problems in your
program. Contains warnings that don't belong in pyflakes and
pycodestyle::
@@ -29,6 +31,22 @@
3. A fearsome imaginary creature, especially one evoked to frighten
children.
+ Installation
+ ------------
+
+ Install from ``pip`` with:
+
+ .. code-block:: sh
+
+ pip install flake8-bugbear
+
+ It will then automatically be run as part of ``flake8``; you can check it has
+ been picked up with:
+
+ .. code-block:: sh
+
+ $ flake8 --version
+ 3.5.0 (assertive: 1.0.1, flake8-bugbear: 18.2.0, flake8-comprehensions: 1.4.1, mccabe: 0.6.1, pycodestyle: 2.3.1, pyflakes: 1.6.0) CPython 3.7.0 on Darwin
List of warnings
----------------
@@ -195,12 +213,12 @@
If you're still invested in Python 2, there might be a small subset of
deprecated syntax that you'd have to abandon... but you're already doing
- that, right? `six <https://pypi.python.org/pypi/six>`_ or
- `python-future <https://pypi.python.org/pypi/future>`_ bridge the gaps.
+ that, right? `six <https://pypi.org/project/six/>`_ or
+ `python-future <https://pypi.org/project/future/>`_ bridge the gaps.
By making the code exclusively Python 3.5+, I'm able to focus on the
quality of the checks and re-use all the nice features of the new
- releases (check out `pathlib <docs.python.org/3/library/pathlib.html>`_)
+ releases (check out `pathlib <https://docs.python.org/3/library/pathlib.html>`_)
instead of wasting cycles on Unicode compatibility, etc.
@@ -353,8 +371,8 @@
Glued together by `Łukasz Langa <mailto:lukasz@langa.pl>`_. Multiple
improvements by `Markus Unterwaditzer <mailto:markus@unterwaditzer.net>`_,
- `Martijn Pieters <mailto:github.com@zopatista.com>`_, and
- `Cooper Lees <mailto:me@cooperlees.com>`_.
+ `Martijn Pieters <mailto:github.com@zopatista.com>`_,
+ `Cooper Lees <mailto:me@cooperlees.com>`_, and `Ryan May <mailto:rmay31@gmail.com>`.
Keywords: flake8 bugbear bugs pyflakes pylint linter qa
Platform: UNKNOWN
@@ -368,6 +386,8 @@
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Topic :: Software Development :: Libraries :: Python Modules
Classifier: Topic :: Software Development :: Quality Assurance
Requires-Python: >=3.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/setup.cfg new/flake8-bugbear-18.8.0/setup.cfg
--- old/flake8-bugbear-18.2.0/setup.cfg 2018-02-05 14:13:59.000000000 +0100
+++ new/flake8-bugbear-18.8.0/setup.cfg 2018-08-14 00:14:42.000000000 +0200
@@ -1,5 +1,5 @@
[bdist_wheel]
-python-tag = py35.py36
+python-tag = py35.py36.py37
[flake8]
ignore = E302, E501
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/setup.py new/flake8-bugbear-18.8.0/setup.py
--- old/flake8-bugbear-18.2.0/setup.py 2018-02-05 14:06:57.000000000 +0100
+++ new/flake8-bugbear-18.8.0/setup.py 2018-08-13 23:47:30.000000000 +0200
@@ -11,52 +11,50 @@
current_dir = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(current_dir, 'README.rst'), encoding='utf8') as ld_file:
+with open(os.path.join(current_dir, "README.rst"), encoding="utf8") as ld_file:
long_description = ld_file.read()
-_version_re = re.compile(r'__version__\s+=\s+(?P<version>.*)')
+_version_re = re.compile(r"__version__\s+=\s+(?P<version>.*)")
-with open(os.path.join(current_dir, 'bugbear.py'), 'r') as f:
- version = _version_re.search(f.read()).group('version')
+with open(os.path.join(current_dir, "bugbear.py"), "r") as f:
+ version = _version_re.search(f.read()).group("version")
version = str(ast.literal_eval(version))
setup(
- name='flake8-bugbear',
+ name="flake8-bugbear",
version=version,
description="A plugin for flake8 finding likely bugs and design problems "
- "in your program. Contains warnings that don't belong in "
- "pyflakes and pycodestyle.",
+ "in your program. Contains warnings that don't belong in "
+ "pyflakes and pycodestyle.",
long_description=long_description,
- keywords='flake8 bugbear bugs pyflakes pylint linter qa',
- author='Łukasz Langa',
- author_email='lukasz(a)langa.pl',
- url='https://github.com/PyCQA/flake8-bugbear',
- license='MIT',
- py_modules=['bugbear'],
+ keywords="flake8 bugbear bugs pyflakes pylint linter qa",
+ author="Łukasz Langa",
+ author_email="lukasz(a)langa.pl",
+ url="https://github.com/PyCQA/flake8-bugbear",
+ license="MIT",
+ py_modules=["bugbear"],
zip_safe=False,
python_requires=">=3.5",
- install_requires=['flake8 >= 3.0.0', 'attrs'],
- test_suite='tests.test_bugbear',
+ install_requires=["flake8 >= 3.0.0", "attrs"],
+ test_suite="tests.test_bugbear",
classifiers=[
- 'Development Status :: 5 - Production/Stable',
- 'Environment :: Console',
- 'Framework :: Flake8',
- 'Intended Audience :: Developers',
- 'License :: OSI Approved :: MIT License',
- 'Operating System :: OS Independent',
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.5',
- 'Programming Language :: Python :: 3.6',
- 'Topic :: Software Development :: Libraries :: Python Modules',
- 'Topic :: Software Development :: Quality Assurance',
+ "Development Status :: 5 - Production/Stable",
+ "Environment :: Console",
+ "Framework :: Flake8",
+ "Intended Audience :: Developers",
+ "License :: OSI Approved :: MIT License",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.5",
+ "Programming Language :: Python :: 3.6",
+ "Programming Language :: Python :: 3.7",
+ "Programming Language :: Python :: 3 :: Only",
+ "Topic :: Software Development :: Libraries :: Python Modules",
+ "Topic :: Software Development :: Quality Assurance",
],
- entry_points={
- 'flake8.extension': [
- 'B = bugbear:BugBearChecker',
- ],
- },
+ entry_points={"flake8.extension": ["B = bugbear:BugBearChecker"]},
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/tests/b001.py new/flake8-bugbear-18.8.0/tests/b001.py
--- old/flake8-bugbear-18.2.0/tests/b001.py 2016-04-13 03:28:57.000000000 +0200
+++ new/flake8-bugbear-18.8.0/tests/b001.py 2018-08-13 23:47:30.000000000 +0200
@@ -36,14 +36,14 @@
def func(**kwargs):
try:
- is_debug = kwargs['debug']
+ is_debug = kwargs["debug"]
except:
# should be except KeyError:
return
results = something.call(debug=is_debug)
try:
- results['ok']
+ results["ok"]
except: # noqa
# warning silenced
return
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/tests/b002.py new/flake8-bugbear-18.8.0/tests/b002.py
--- old/flake8-bugbear-18.2.0/tests/b002.py 2016-06-06 23:14:15.000000000 +0200
+++ new/flake8-bugbear-18.8.0/tests/b002.py 2018-08-13 23:47:30.000000000 +0200
@@ -1,19 +1,20 @@
"""
Should emit:
-B002 - on lines 13 and 17
+B002 - on lines 15 and 20
"""
+
def this_is_all_fine(n):
x = n + 1
y = 1 + n
- z = + x + y
+ z = +x + y
return +z
+
def this_is_buggy(n):
x = ++n
return x
+
def this_is_buggy_too(n):
- return (+
- +n
- )
+ return ++n
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/tests/b004.py new/flake8-bugbear-18.8.0/tests/b004.py
--- old/flake8-bugbear-18.2.0/tests/b004.py 2016-11-10 00:59:44.000000000 +0100
+++ new/flake8-bugbear-18.8.0/tests/b004.py 2018-08-13 23:47:30.000000000 +0200
@@ -1,11 +1,12 @@
def this_is_a_bug():
o = object()
- if hasattr(o, '__call__'):
- print('Ooh, callable! Or is it?')
- if getattr(o, '__call__', False):
- print('Ooh, callable! Or is it?')
+ if hasattr(o, "__call__"):
+ print("Ooh, callable! Or is it?")
+ if getattr(o, "__call__", False):
+ print("Ooh, callable! Or is it?")
+
def this_is_fine():
o = object()
if callable(o):
- print('Ooh, this is actually callable.')
+ print("Ooh, this is actually callable.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/tests/b005.py new/flake8-bugbear-18.8.0/tests/b005.py
--- old/flake8-bugbear-18.2.0/tests/b005.py 2016-11-10 19:36:12.000000000 +0100
+++ new/flake8-bugbear-18.8.0/tests/b005.py 2018-08-13 23:47:30.000000000 +0200
@@ -22,5 +22,5 @@
strip("we") # no warning
other_type().lstrip() # no warning
-other_type().rstrip(['a', 'b', 'c']) # no warning
+other_type().rstrip(["a", "b", "c"]) # no warning
other_type().strip("a", "b") # no warning
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/tests/b006_b008.py new/flake8-bugbear-18.8.0/tests/b006_b008.py
--- old/flake8-bugbear-18.2.0/tests/b006_b008.py 2017-12-12 18:16:54.000000000 +0100
+++ new/flake8-bugbear-18.8.0/tests/b006_b008.py 2018-08-13 23:47:30.000000000 +0200
@@ -22,17 +22,29 @@
def this_too(value=collections.OrderedDict()):
...
+
async def async_this_too(value=collections.OrderedDict()):
...
+
def do_this_instead(value=None):
if value is None:
value = set()
+
def in_fact_all_calls_are_wrong(value=time.time()):
...
-LOGGER= logging.getLogger(__name__)
+
+LOGGER = logging.getLogger(__name__)
+
+
def do_this_instead_of_calls_in_defaults(logger=LOGGER):
# That makes it more obvious that this one value is reused.
...
+
+def kwonlyargs_immutable(*, value=()):
+ ...
+
+def kwonlyargs_mutable(*, value=[]):
+ ...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/tests/b301_b302_b305.py new/flake8-bugbear-18.8.0/tests/b301_b302_b305.py
--- old/flake8-bugbear-18.2.0/tests/b301_b302_b305.py 2016-06-07 00:28:58.000000000 +0200
+++ new/flake8-bugbear-18.8.0/tests/b301_b302_b305.py 2018-08-13 23:47:30.000000000 +0200
@@ -1,8 +1,8 @@
"""
Should emit:
-B301 - on lines 33-36
-B302 - on lines 37-40
-B305 - on lines 37-40
+B301 - on lines 39-42
+B302 - on lines 43-46
+B305 - on lines 47-48
"""
import builtins # future's builtins really
@@ -11,6 +11,7 @@
from six import iterkeys
from future.utils import itervalues
+
def this_is_okay():
d = {}
iterkeys(d)
@@ -32,6 +33,7 @@
six.next(d)
builtins.next(d)
+
def everything_else_is_wrong():
d = None # note: bugbear is no type checker
d.iterkeys()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/tests/b303_b304.py new/flake8-bugbear-18.8.0/tests/b303_b304.py
--- old/flake8-bugbear-18.2.0/tests/b303_b304.py 2016-06-10 00:21:48.000000000 +0200
+++ new/flake8-bugbear-18.8.0/tests/b303_b304.py 2018-08-13 23:47:30.000000000 +0200
@@ -1,22 +1,26 @@
"""
Should emit:
-B303 - on line 21
-B304 - on line 38
+B303 - on line 25
+B304 - on line 42
"""
import sys
import something_else
+
def this_is_okay():
something_else.maxint
maxint = 3
maxint
+
maxint = 3
+
def this_is_also_okay():
maxint
+
class CustomClassWithBrokenMetaclass:
__metaclass__ = type
maxint = 5 # this is okay
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/tests/b901.py new/flake8-bugbear-18.8.0/tests/b901.py
--- old/flake8-bugbear-18.2.0/tests/b901.py 2016-10-04 22:22:22.000000000 +0200
+++ new/flake8-bugbear-18.8.0/tests/b901.py 2018-08-13 23:47:30.000000000 +0200
@@ -1,8 +1,9 @@
"""
Should emit:
-B901 - on lines 8, 35
+B901 - on lines 9, 36
"""
+
def broken():
if True:
return [1, 2, 3]
@@ -39,6 +40,7 @@
async def not_broken4():
import asyncio
+
await asyncio.sleep(1)
return 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/tests/b903.py new/flake8-bugbear-18.8.0/tests/b903.py
--- old/flake8-bugbear-18.2.0/tests/b903.py 2017-02-28 20:34:58.000000000 +0100
+++ new/flake8-bugbear-18.8.0/tests/b903.py 2018-08-13 23:47:30.000000000 +0200
@@ -8,7 +8,7 @@
class NoWarningsClassAttributes:
- spam = 'ham'
+ spam = "ham"
def __init__(self, foo, bar):
self.foo = foo
@@ -19,12 +19,12 @@
def __init__(self, foo, bar):
self.foo = foo
self.bar = bar
- self.spam = ' - '.join([foo, bar])
+ self.spam = " - ".join([foo, bar])
class NoWarningsMoreStatements:
def __init__(self, foo, bar):
- foo = ' - '.join([foo, bar])
+ foo = " - ".join([foo, bar])
self.foo = foo
self.bar = bar
@@ -37,6 +37,7 @@
class WarningsWithDocstring:
"""A docstring should not be an impediment to a warning"""
+
def __init__(self, foo, bar):
self.foo = foo
self.bar = bar
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/flake8-bugbear-18.2.0/tests/test_bugbear.py new/flake8-bugbear-18.8.0/tests/test_bugbear.py
--- old/flake8-bugbear-18.2.0/tests/test_bugbear.py 2017-12-12 18:16:54.000000000 +0100
+++ new/flake8-bugbear-18.8.0/tests/test_bugbear.py 2018-08-13 23:47:30.000000000 +0200
@@ -32,171 +32,170 @@
return [BugBearChecker.adapt_error(e) for e in errors]
def test_b001(self):
- filename = Path(__file__).absolute().parent / 'b001.py'
+ filename = Path(__file__).absolute().parent / "b001.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
- self.assertEqual(
- errors,
- self.errors(B001(8, 0), B001(40, 4)),
- )
+ self.assertEqual(errors, self.errors(B001(8, 0), B001(40, 4)))
def test_b002(self):
- filename = Path(__file__).absolute().parent / 'b002.py'
+ filename = Path(__file__).absolute().parent / "b002.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
- self.assertEqual(
- errors,
- self.errors(B002(13, 8), B002(17, 12)),
- )
+ self.assertEqual(errors, self.errors(B002(15, 8), B002(20, 11)))
def test_b003(self):
- filename = Path(__file__).absolute().parent / 'b003.py'
+ filename = Path(__file__).absolute().parent / "b003.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
- self.assertEqual(
- errors,
- self.errors(B003(10, 0)),
- )
+ self.assertEqual(errors, self.errors(B003(10, 0)))
def test_b004(self):
- filename = Path(__file__).absolute().parent / 'b004.py'
+ filename = Path(__file__).absolute().parent / "b004.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
- self.assertEqual(
- errors,
- self.errors(B004(3, 7), B004(5, 7)),
- )
+ self.assertEqual(errors, self.errors(B004(3, 7), B004(5, 7)))
def test_b005(self):
- filename = Path(__file__).absolute().parent / 'b005.py'
+ filename = Path(__file__).absolute().parent / "b005.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
self.assertEqual(
errors,
- self.errors(B005(4, 0), B005(7, 0), B005(10, 0), B005(13, 0),
- B005(16, 0), B005(19, 0)),
+ self.errors(
+ B005(4, 0),
+ B005(7, 0),
+ B005(10, 0),
+ B005(13, 0),
+ B005(16, 0),
+ B005(19, 0),
+ ),
)
def test_b006_b008(self):
- filename = Path(__file__).absolute().parent / 'b006_b008.py'
+ filename = Path(__file__).absolute().parent / "b006_b008.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
self.assertEqual(
errors,
- self.errors(B006(10, 24), B006(14, 29), B006(18, 19), B006(22, 19),
- B006(25, 31), B008(32, 38)),
+ self.errors(
+ B006(10, 24),
+ B006(14, 29),
+ B006(18, 19),
+ B006(22, 19),
+ B006(26, 31),
+ B008(35, 38),
+ B006(49, 32),
+ ),
)
def test_b007(self):
- filename = Path(__file__).absolute().parent / 'b007.py'
+ filename = Path(__file__).absolute().parent / "b007.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
self.assertEqual(
errors,
- self.errors(B007(6, 4, vars=('i',)), B007(18, 12, vars=('k',)),
- B007(30, 4, vars=('i',)), B007(30, 12, vars=('k',))),
+ self.errors(
+ B007(6, 4, vars=("i",)),
+ B007(18, 12, vars=("k",)),
+ B007(30, 4, vars=("i",)),
+ B007(30, 12, vars=("k",)),
+ ),
)
def test_b301_b302_b305(self):
- filename = Path(__file__).absolute().parent / 'b301_b302_b305.py'
+ filename = Path(__file__).absolute().parent / "b301_b302_b305.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
self.assertEqual(
errors,
- self.errors(B301(37, 4), B301(38, 4), B301(39, 4), B301(40, 4),
- B302(41, 4), B302(42, 4), B302(43, 4), B302(44, 4),
- B305(45, 4), B305(46, 4)),
+ self.errors(
+ B301(39, 4),
+ B301(40, 4),
+ B301(41, 4),
+ B301(42, 4),
+ B302(43, 4),
+ B302(44, 4),
+ B302(45, 4),
+ B302(46, 4),
+ B305(47, 4),
+ B305(48, 4),
+ ),
)
def test_b303_b304(self):
- filename = Path(__file__).absolute().parent / 'b303_b304.py'
+ filename = Path(__file__).absolute().parent / "b303_b304.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
- self.assertEqual(
- errors,
- self.errors(B303(21, 4), B304(38, 4)),
- )
+ self.assertEqual(errors, self.errors(B303(25, 4), B304(42, 4)))
def test_b306(self):
- filename = Path(__file__).absolute().parent / 'b306.py'
+ filename = Path(__file__).absolute().parent / "b306.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
- self.assertEqual(
- errors,
- self.errors(B306(9, 10)),
- )
+ self.assertEqual(errors, self.errors(B306(9, 10)))
def test_b901(self):
- filename = Path(__file__).absolute().parent / 'b901.py'
+ filename = Path(__file__).absolute().parent / "b901.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
- self.assertEqual(
- errors,
- self.errors(B901(8, 8), B901(35, 4))
- )
+ self.assertEqual(errors, self.errors(B901(9, 8), B901(36, 4)))
def test_b902(self):
- filename = Path(__file__).absolute().parent / 'b902.py'
+ filename = Path(__file__).absolute().parent / "b902.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
self.assertEqual(
errors,
self.errors(
- B902(29, 17, vars=("'i_am_special'", 'instance', 'self')),
- B902(32, 30, vars=("'cls'", 'instance', 'self')),
- B902(35, 4, vars=("(none)", 'instance', 'self',)),
- B902(39, 12, vars=("'self'", 'class', 'cls')),
- B902(42, 22, vars=("*args", 'instance', 'self')),
- B902(48, 30, vars=("**kwargs", 'instance', 'self')),
- B902(51, 32, vars=("*, self", 'instance', 'self')),
- B902(54, 44, vars=("*, self", 'instance', 'self')),
- B902(68, 17, vars=("'self'", 'metaclass instance', 'cls')),
- B902(72, 20, vars=("'cls'", 'metaclass class', 'metacls')),
- )
+ B902(29, 17, vars=("'i_am_special'", "instance", "self")),
+ B902(32, 30, vars=("'cls'", "instance", "self")),
+ B902(35, 4, vars=("(none)", "instance", "self")),
+ B902(39, 12, vars=("'self'", "class", "cls")),
+ B902(42, 22, vars=("*args", "instance", "self")),
+ B902(48, 30, vars=("**kwargs", "instance", "self")),
+ B902(51, 32, vars=("*, self", "instance", "self")),
+ B902(54, 44, vars=("*, self", "instance", "self")),
+ B902(68, 17, vars=("'self'", "metaclass instance", "cls")),
+ B902(72, 20, vars=("'cls'", "metaclass class", "metacls")),
+ ),
)
def test_b903(self):
- filename = Path(__file__).absolute().parent / 'b903.py'
+ filename = Path(__file__).absolute().parent / "b903.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
- self.assertEqual(
- errors,
- self.errors(B903(32, 0), B903(38, 0)),
- )
+ self.assertEqual(errors, self.errors(B903(32, 0), B903(38, 0)))
def test_b950(self):
- filename = Path(__file__).absolute().parent / 'b950.py'
+ filename = Path(__file__).absolute().parent / "b950.py"
bbc = BugBearChecker(filename=str(filename))
errors = list(bbc.run())
- self.assertEqual(
- errors,
- self.errors(B950(6, 92, vars=(92, 79))),
- )
+ self.assertEqual(errors, self.errors(B950(6, 92, vars=(92, 79))))
def test_selfclean_bugbear(self):
- filename = Path(__file__).absolute().parent.parent / 'bugbear.py'
+ filename = Path(__file__).absolute().parent.parent / "bugbear.py"
proc = subprocess.run(
- ['flake8', str(filename)],
+ ["flake8", str(filename)],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
timeout=60,
)
- self.assertEqual(proc.returncode, 0, proc.stdout.decode('utf8'))
- self.assertEqual(proc.stdout, b'')
- # self.assertEqual(proc.stderr, b'')
+ self.assertEqual(proc.returncode, 0, proc.stdout.decode("utf8"))
+ self.assertEqual(proc.stdout, b"")
+ # self.assertEqual(proc.stderr, b"")
def test_selfclean_test_bugbear(self):
filename = Path(__file__).absolute()
proc = subprocess.run(
- ['flake8', str(filename)],
+ ["flake8", str(filename)],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
timeout=60,
)
- self.assertEqual(proc.returncode, 0, proc.stdout.decode('utf8'))
- self.assertEqual(proc.stdout, b'')
+ self.assertEqual(proc.returncode, 0, proc.stdout.decode("utf8"))
+ self.assertEqual(proc.stdout, b"")
# self.assertEqual(proc.stderr, b'')
-if __name__ == '__main__':
+if __name__ == "__main__":
unittest.main()
1
0
Hello community,
here is the log from the commit of package chromium for openSUSE:Factory checked in at 2018-11-06 14:36:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Tue Nov 6 14:36:00 2018 rev:200 rq:646249 version:70.0.3538.77
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2018-10-31 13:15:11.407411110 +0100
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2018-11-06 14:37:49.340738072 +0100
@@ -1,0 +2,8 @@
+Sat Nov 3 21:18:07 UTC 2018 - Yunhe Guo <i(a)guoyunhe.me>
+
+- Remove noto-emoji-fonts recommends. noto-emoji-fonts has been
+ inactive for a long time. noto-coloremoji-fonts is the current
+ recommended emoji fonts from noto. And noto-emoji-fonts (monochrome)
+ disables noto-coloremoji-fonts (colorful).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.tvpNnb/_old 2018-11-06 14:37:59.064723373 +0100
+++ /var/tmp/diff_new_pack.tvpNnb/_new 2018-11-06 14:37:59.068723366 +0100
@@ -187,7 +187,6 @@
Requires: xdg-utils
Requires(pre): permissions
Recommends: noto-coloremoji-fonts
-Recommends: noto-emoji-fonts
Conflicts: chromium-browser
Provides: chromium-based-browser = %{version}
Provides: chromium-browser = %{version}
1
0
Hello community,
here is the log from the commit of package buildah for openSUSE:Factory checked in at 2018-11-06 14:35:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/buildah (Old)
and /work/SRC/openSUSE:Factory/.buildah.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "buildah"
Tue Nov 6 14:35:06 2018 rev:10 rq:646244 version:1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/buildah/buildah.changes 2018-10-11 11:50:29.758401729 +0200
+++ /work/SRC/openSUSE:Factory/.buildah.new/buildah.changes 2018-11-06 14:37:41.248750304 +0100
@@ -1,0 +2,6 @@
+Sun Nov 4 08:49:19 UTC 2018 - Valentin Rothberg <vrothberg(a)suse.com>
+
+- Require slirp4netns to enable networking for unprivileged network namespaces
+ aka networking for rootless buildah.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ buildah.spec ++++++
--- /var/tmp/diff_new_pack.cGLIEm/_old 2018-11-06 14:37:42.176748902 +0100
+++ /var/tmp/diff_new_pack.cGLIEm/_new 2018-11-06 14:37:42.180748896 +0100
@@ -49,6 +49,7 @@
Requires: libcontainers-image
Requires: libcontainers-storage
Requires: runc >= 1.0.0~rc4
+Requires: slirp4netns
%{go_nostrip}
%if 0%{?with_libostree}
BuildRequires: libostree-devel
1
0
Hello community,
here is the log from the commit of package ffmpegthumbs for openSUSE:Factory checked in at 2018-11-06 14:34:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ffmpegthumbs (Old)
and /work/SRC/openSUSE:Factory/.ffmpegthumbs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpegthumbs"
Tue Nov 6 14:34:53 2018 rev:42 rq:646189 version:18.08.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ffmpegthumbs/ffmpegthumbs.changes 2018-10-17 08:28:11.146533271 +0200
+++ /work/SRC/openSUSE:Factory/.ffmpegthumbs.new/ffmpegthumbs.changes 2018-11-06 14:37:26.596772455 +0100
@@ -1,0 +2,6 @@
+Sat Nov 3 10:43:00 UTC 2018 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Add patch to fix crash on video files without a suitable codec installed:
+ * 0001-Don-t-crash-if-initializeVideo-fails.patch
+
+-------------------------------------------------------------------
New:
----
0001-Don-t-crash-if-initializeVideo-fails.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ffmpegthumbs.spec ++++++
--- /var/tmp/diff_new_pack.2OTbDF/_old 2018-11-06 14:37:30.368766753 +0100
+++ /var/tmp/diff_new_pack.2OTbDF/_new 2018-11-06 14:37:30.368766753 +0100
@@ -27,6 +27,8 @@
Group: System/GUI/KDE
Url: http://www.kde.org
Source0: %{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-Don-t-crash-if-initializeVideo-fails.patch
BuildRequires: extra-cmake-modules
BuildRequires: kf5-filesystem
BuildRequires: ki18n-devel
@@ -46,6 +48,7 @@
%prep
%setup -q
+%autopatch -p1
%build
%cmake_kf5 -d build
++++++ 0001-Don-t-crash-if-initializeVideo-fails.patch ++++++
>From 477fe05f410852b78d44243a796c73dda2165398 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian(a)ritter-vogt.de>
Date: Sat, 3 Nov 2018 11:41:56 +0100
Subject: [PATCH] Don't crash if initializeVideo fails
Summary:
If avcodec_find_decoder returns NULL, a warning is printed and then NULL is
dereferenced later...
Test Plan:
A user crashed thumbnail.so reproducably with a specific file.
Doesn't anymore with this patch applied.
Reviewers: broulik
Differential Revision: https://phabricator.kde.org/D16631
---
ffmpegthumbnailer/moviedecoder.cpp | 14 ++++++++++----
ffmpegthumbnailer/moviedecoder.h | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ffmpegthumbnailer/moviedecoder.cpp b/ffmpegthumbnailer/moviedecoder.cpp
index 6d1a79c..207e36b 100644
--- a/ffmpegthumbnailer/moviedecoder.cpp
+++ b/ffmpegthumbnailer/moviedecoder.cpp
@@ -73,7 +73,10 @@ void MovieDecoder::initialize(const QString& filename)
return;
}
- initializeVideo();
+ if (!initializeVideo()) {
+ // It already printed a message
+ return;
+ }
m_pFrame = av_frame_alloc();
if (m_pFrame) {
@@ -126,7 +129,7 @@ QString MovieDecoder::getCodec()
return codecName;
}
-void MovieDecoder::initializeVideo()
+bool MovieDecoder::initializeVideo()
{
for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++) {
if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
@@ -138,7 +141,7 @@ void MovieDecoder::initializeVideo()
if (m_VideoStream == -1) {
qDebug() << "Could not find video stream";
- return;
+ return false;
}
m_pVideoCodecContext = m_pFormatContext->streams[m_VideoStream]->codec;
@@ -148,14 +151,17 @@ void MovieDecoder::initializeVideo()
// set to NULL, otherwise avcodec_close(m_pVideoCodecContext) crashes
m_pVideoCodecContext = NULL;
qDebug() << "Video Codec not found";
- return;
+ return false;
}
m_pVideoCodecContext->workaround_bugs = 1;
if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, 0) < 0) {
qDebug() << "Could not open video codec";
+ return false;
}
+
+ return true;
}
int MovieDecoder::getWidth()
diff --git a/ffmpegthumbnailer/moviedecoder.h b/ffmpegthumbnailer/moviedecoder.h
index 060c02e..eadc8e2 100644
--- a/ffmpegthumbnailer/moviedecoder.h
+++ b/ffmpegthumbnailer/moviedecoder.h
@@ -51,7 +51,7 @@ public:
bool getInitialized();
private:
- void initializeVideo();
+ bool initializeVideo();
bool decodeVideoPacket();
bool getVideoPacket();
--
2.19.0
1
0