From b0a50e7198747efb1d09dca4a1778148beac9576 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 12 Jul 2017 08:41:37 +0900 Subject: [PATCH] Imported Upstream version 3.12.2 Change-Id: I881ee955f07de5f6f8a0209c2d4c9a2d82a01d2b Signed-off-by: DongHun Kwak --- ChangeLog | 63 ++++++++++++++++++++++++++++++ NEWS | 4 ++ PKG-INFO | 4 +- configure | 24 ++++++------ configure.ac | 2 +- gi/overrides/GIMarshallingTests.py | 4 +- gi/overrides/Gio.py | 4 +- gi/overrides/Gtk.py | 6 +-- gi/types.py | 2 +- pygtkcompat/pygtkcompat.py | 8 ++-- tests/test_everything.py | 1 - tests/test_gi.py | 11 ++---- tests/test_iochannel.py | 2 +- tests/test_option.py | 2 +- tests/test_repository.py | 4 +- tests/test_signal.py | 28 ++++++------- 16 files changed, 116 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index 736c989..e42edca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,66 @@ +commit 086c10133d6d9ac155e3a7fee7dde198aea1343d +Author: Simon Feltman +Date: Fri May 2 21:36:25 2014 -0700 + + PEP8 fixes + + Use infix 'not' instead of prefixed. + Don't use double comments (##). + Use space between comment and text. + Un-comment tests that now work. + Move broken (and won't fix) implicit int64 signal tests into + a new skipped test function. + + gi/overrides/GIMarshallingTests.py | 4 ++-- + gi/overrides/Gio.py | 4 ++-- + gi/overrides/Gtk.py | 6 +++--- + gi/types.py | 2 +- + pygtkcompat/pygtkcompat.py | 4 ++-- + tests/test_everything.py | 1 - + tests/test_gi.py | 9 +++------ + tests/test_iochannel.py | 2 +- + tests/test_option.py | 2 +- + tests/test_signal.py | 28 +++++++++++++--------------- + 10 files changed, 28 insertions(+), 34 deletions(-) + +commit 382bb7e9e84ae142d18832409e4f5e969876c84c +Author: Simon Feltman +Date: Mon May 26 03:01:13 2014 -0700 + + Python 3.4 make check fixes + + Use unittest.skip() instead of unittest.expectedFailure() for + tests which + pass in GI 1.39.0. This is needed to get rid of unexpected successes + which + fail unittesting in Python 3.4. + Silence deprecation warning when using imp.reload. + + https://bugzilla.gnome.org/show_bug.cgi?id=730411 + + pygtkcompat/pygtkcompat.py | 4 +++- + tests/test_gi.py | 2 +- + tests/test_repository.py | 4 ++-- + 3 files changed, 6 insertions(+), 4 deletions(-) + +commit 458ea7555445ec8f0e57c009ca0de985bcfa4d53 +Author: Simon Feltman +Date: Mon Apr 14 16:23:24 2014 -0700 + + configure.ac: post release version bump to 3.12.2 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 193b114a6425e5dba0c91d17227a050529ffe40b +Author: Simon Feltman +Date: Mon Apr 14 16:15:48 2014 -0700 + + release 3.12.1 + + NEWS | 5 +++++ + 1 file changed, 5 insertions(+) + commit 6638b188abed038b4dfa2589826ef36a2145b957 Author: Simon Feltman Date: Mon Apr 14 15:10:01 2014 -0700 diff --git a/NEWS b/NEWS index 9f864fe..654fec3 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +3.12.2 26-May-2014 + - PEP8 fixes (Simon Feltman) + - Python 3.4 make check fixes (Simon Feltman) (#730411) + 3.12.1 14-Apr-2014 - Fix crash with type checking invalid GObject arguments (Simon Feltman) (#727604) diff --git a/PKG-INFO b/PKG-INFO index 074a530..770e525 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: PyGObject -Version: 3.12.1 +Version: 3.12.2 Summary: Python bindings for GObject Home-page: http://www.pygtk.org/ Author: James Henstridge @@ -8,7 +8,7 @@ Author-email: james@daa.com.au Maintainer: Johan Dahlin Maintainer-email: johan@gnome.org License: GNU LGPL -Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.12/pygobject-3.12.1.tar.gz +Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.12/pygobject-3.12.2.tar.gz Description: Python bindings for GLib and GObject Platform: POSIX, Windows Classifier: Development Status :: 5 - Production/Stable diff --git a/configure b/configure index 8ea4f75..3cbfd1d 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pygobject 3.12.1. +# Generated by GNU Autoconf 2.69 for pygobject 3.12.2. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pygobject' PACKAGE_TARNAME='pygobject' -PACKAGE_VERSION='3.12.1' -PACKAGE_STRING='pygobject 3.12.1' +PACKAGE_VERSION='3.12.2' +PACKAGE_STRING='pygobject 3.12.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject' PACKAGE_URL='https://live.gnome.org/PyGObject/' @@ -1395,7 +1395,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pygobject 3.12.1 to adapt to many kinds of systems. +\`configure' configures pygobject 3.12.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1465,7 +1465,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pygobject 3.12.1:";; + short | recursive ) echo "Configuration of pygobject 3.12.2:";; esac cat <<\_ACEOF @@ -1603,7 +1603,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pygobject configure 3.12.1 +pygobject configure 3.12.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1881,7 +1881,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pygobject $as_me 3.12.1, which was +It was created by pygobject $as_me 3.12.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2245,9 +2245,9 @@ $as_echo "#define PYGOBJECT_MINOR_VERSION 12" >>confdefs.h PYGOBJECT_MINOR_VERSION=12 -$as_echo "#define PYGOBJECT_MICRO_VERSION 1" >>confdefs.h +$as_echo "#define PYGOBJECT_MICRO_VERSION 2" >>confdefs.h -PYGOBJECT_MICRO_VERSION=1 +PYGOBJECT_MICRO_VERSION=2 ac_config_headers="$ac_config_headers config.h" @@ -2767,7 +2767,7 @@ fi # Define the identity of the package. PACKAGE='pygobject' - VERSION='3.12.1' + VERSION='3.12.2' cat >>confdefs.h <<_ACEOF @@ -15370,7 +15370,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pygobject $as_me 3.12.1, which was +This file was extended by pygobject $as_me 3.12.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15437,7 +15437,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pygobject config.status 3.12.1 +pygobject config.status 3.12.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c394c86..bd9f271 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ m4_define(python3_min_ver, 3.1) dnl the pygobject version number m4_define(pygobject_major_version, 3) m4_define(pygobject_minor_version, 12) -m4_define(pygobject_micro_version, 1) +m4_define(pygobject_micro_version, 2) m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version) dnl versions of packages we require ... diff --git a/gi/overrides/GIMarshallingTests.py b/gi/overrides/GIMarshallingTests.py index cc967b4..b675adf 100644 --- a/gi/overrides/GIMarshallingTests.py +++ b/gi/overrides/GIMarshallingTests.py @@ -53,13 +53,13 @@ class OverridesObject(GIMarshallingTests.OverridesObject): def __init__(self, long_): GIMarshallingTests.OverridesObject.__init__(self) # FIXME: doesn't work yet - #self.long_ = long_ + # self.long_ = long_ @classmethod def new(cls, long_): self = GIMarshallingTests.OverridesObject.new() # FIXME: doesn't work yet - #self.long_ = long_ + # self.long_ = long_ return self def method(self): diff --git a/gi/overrides/Gio.py b/gi/overrides/Gio.py index 5a5dd2f..e646821 100644 --- a/gi/overrides/Gio.py +++ b/gi/overrides/Gio.py @@ -82,14 +82,14 @@ class Settings(Gio.Settings): def __getitem__(self, key): # get_value() aborts the program on an unknown key - if not key in self: + if key not in self: raise KeyError('unknown key: %r' % (key,)) return self.get_value(key).unpack() def __setitem__(self, key, value): # set_value() aborts the program on an unknown key - if not key in self: + if key not in self: raise KeyError('unknown key: %r' % (key,)) # determine type string of this key diff --git a/gi/overrides/Gtk.py b/gi/overrides/Gtk.py index ff9aea1..8887da8 100644 --- a/gi/overrides/Gtk.py +++ b/gi/overrides/Gtk.py @@ -1119,13 +1119,13 @@ class TreePath(Gtk.TreePath): return self.to_string() def __lt__(self, other): - return not other is None and self.compare(other) < 0 + return other is not None and self.compare(other) < 0 def __le__(self, other): - return not other is None and self.compare(other) <= 0 + return other is not None and self.compare(other) <= 0 def __eq__(self, other): - return not other is None and self.compare(other) == 0 + return other is not None and self.compare(other) == 0 def __ne__(self, other): return other is None or self.compare(other) != 0 diff --git a/gi/types.py b/gi/types.py index e6e3903..6007e53 100644 --- a/gi/types.py +++ b/gi/types.py @@ -182,7 +182,7 @@ class _GObjectMetaBase(type): cls._type_register(cls.__dict__) def _type_register(cls, namespace): - ## don't register the class if already registered + # don't register the class if already registered if '__gtype__' in namespace: return diff --git a/pygtkcompat/pygtkcompat.py b/pygtkcompat/pygtkcompat.py index d5b7b94..7ee2de4 100644 --- a/pygtkcompat/pygtkcompat.py +++ b/pygtkcompat/pygtkcompat.py @@ -38,8 +38,10 @@ import warnings try: # Python 3 from collections import UserList - from imp import reload UserList # pyflakes + with warnings.catch_warnings(): + warnings.simplefilter('ignore') + from imp import reload except ImportError: # Python 2 ships that in a different module from UserList import UserList @@ -357,10 +359,10 @@ def enable_gtk(version='3.0'): except AttributeError: pass - #AccelGroup + # AccelGroup Gtk.AccelGroup.connect_group = Gtk.AccelGroup.connect - #StatusIcon + # StatusIcon Gtk.status_icon_position_menu = Gtk.StatusIcon.position_menu Gtk.StatusIcon.set_tooltip = Gtk.StatusIcon.set_tooltip_text diff --git a/tests/test_everything.py b/tests/test_everything.py index 0cd1804..cc79dc3 100644 --- a/tests/test_everything.py +++ b/tests/test_everything.py @@ -15,7 +15,6 @@ try: except ImportError: has_cairo = False -#import gi from gi.repository import GObject from gi.repository import GLib from gi.repository import Gio diff --git a/tests/test_gi.py b/tests/test_gi.py index 5f6e481..a008ce7 100644 --- a/tests/test_gi.py +++ b/tests/test_gi.py @@ -61,9 +61,8 @@ class Sequence(object): class TestConstant(unittest.TestCase): -# Blocked by https://bugzilla.gnome.org/show_bug.cgi?id=595773 -# def test_constant_utf8(self): -# self.assertEqual(CONSTANT_UTF8, GIMarshallingTests.CONSTANT_UTF8) + def test_constant_utf8(self): + self.assertEqual(CONSTANT_UTF8, GIMarshallingTests.CONSTANT_UTF8) def test_constant_number(self): self.assertEqual(CONSTANT_NUMBER, GIMarshallingTests.CONSTANT_NUMBER) @@ -2005,7 +2004,7 @@ class TestGObject(unittest.TestCase): GIMarshallingTests.Object.none_inout(GIMarshallingTests.SubObject(int=42)) - @unittest.expectedFailure # https://bugzilla.gnome.org/show_bug.cgi?id=709796 + @unittest.skip('https://bugzilla.gnome.org/show_bug.cgi?id=709796') def test_object_full_inout(self): # Using gimarshallingtests.c from GI versions > 1.38.0 will show this # test as an "unexpected success" due to reference leak fixes in that file. @@ -2520,9 +2519,7 @@ class TestOverrides(unittest.TestCase): # not overridden self.assertEqual(GIMarshallingTests.SubObject.__module__, 'gi.repository.GIMarshallingTests') - # FIXME: does not work with TEST_NAMES='test_thread test_gi.TestOverrides', - # it is importlib._bootstrap then - #self.assertEqual(GObject.InitiallyUnowned.__module__, 'gi.repository.GObject') + self.assertEqual(GObject.InitiallyUnowned.__module__, 'gi.repository.GObject') class TestDir(unittest.TestCase): diff --git a/tests/test_iochannel.py b/tests/test_iochannel.py index 0cc1b4b..259171b 100644 --- a/tests/test_iochannel.py +++ b/tests/test_iochannel.py @@ -108,7 +108,7 @@ second line ch.seek(2, 2) # SEEK_END # FIXME: does not work currently - #self.assertEqual(ch.read(2), b'n!') + # self.assertEqual(ch.read(2), b'n!') # invalid whence value self.assertRaises(ValueError, ch.seek, 0, 3) diff --git a/tests/test_option.py b/tests/test_option.py index 2900edd..fe25746 100644 --- a/tests/test_option.py +++ b/tests/test_option.py @@ -71,7 +71,7 @@ class TestOption(unittest.TestCase): def test_parse_args_double_dash(self): options, args = self.parser.parse_args( ["test_option.py", "--", "-xxx"]) - #self.assertEqual(args, ["-xxx"]) + # self.assertEqual(args, ["-xxx"]) def test_parse_args_group(self): group = self._create_group() diff --git a/tests/test_repository.py b/tests/test_repository.py index c02581c..39722ef 100644 --- a/tests/test_repository.py +++ b/tests/test_repository.py @@ -213,7 +213,7 @@ class Test(unittest.TestCase): self.assertEqual(func_info.get_return_type().get_tag(), GIRepository.TypeTag.VOID) self.assertRaises(AttributeError, func_info.get_return_attribute, '_not_an_attr') - @unittest.expectedFailure # https://bugzilla.gnome.org/show_bug.cgi?id=709462 + @unittest.skip('https://bugzilla.gnome.org/show_bug.cgi?id=709462') @unittest.skipUnless(has_cairo, 'Regress needs cairo') def test_signal_info(self): repo.require('Regress') @@ -231,7 +231,7 @@ class Test(unittest.TestCase): self.assertFalse(sig_info.true_stops_emit()) self.assertEqual(sig_info.get_flags(), sig_flags) - @unittest.expectedFailure # https://bugzilla.gnome.org/show_bug.cgi?id=709462 + @unittest.skip('https://bugzilla.gnome.org/show_bug.cgi?id=709462') @unittest.skipUnless(has_cairo, 'Regress needs cairo') def test_notify_signal_info_with_obj(self): repo.require('Regress') diff --git a/tests/test_signal.py b/tests/test_signal.py index 429afc9..80d4ac5 100644 --- a/tests/test_signal.py +++ b/tests/test_signal.py @@ -136,9 +136,9 @@ class TestAccumulator(unittest.TestCase): inst = Foo() inst.my_acc_signal.connect(lambda obj: 1) inst.my_acc_signal.connect(lambda obj: 2) - ## the value returned in the following handler will not be - ## considered, because at this point the accumulator already - ## reached its limit. + # the value returned in the following handler will not be + # considered, because at this point the accumulator already + # reached its limit. inst.my_acc_signal.connect(lambda obj: 3) retval = inst.my_acc_signal.emit() self.assertEqual(retval, 3) @@ -147,8 +147,8 @@ class TestAccumulator(unittest.TestCase): inst = Foo() inst.my_other_acc_signal.connect(self._true_handler1) inst.my_other_acc_signal.connect(self._true_handler2) - ## the following handler will not be called because handler2 - ## returns True, so it should stop the emission. + # the following handler will not be called because handler2 + # returns True, so it should stop the emission. inst.my_other_acc_signal.connect(self._true_handler3) self.__true_val = None inst.my_other_acc_signal.emit() @@ -629,20 +629,20 @@ class _TestCMarshaller: rv = self.obj.emit("test-gvalue", v) self.assertEqual(rv, GObject.G_MAXINT64) - # implicit int64 - # does not work, see https://bugzilla.gnome.org/show_bug.cgi?id=683775 - #rv = self.obj.emit("test-gvalue", GObject.G_MAXINT64) - #self.assertEqual(rv, GObject.G_MAXINT64) - # explicit uint64 v = GObject.Value(GObject.TYPE_UINT64, GObject.G_MAXUINT64) rv = self.obj.emit("test-gvalue", v) self.assertEqual(rv, GObject.G_MAXUINT64) + @unittest.expectedFailure # https://bugzilla.gnome.org/show_bug.cgi?id=705291 + def test_gvalue_implicit_int64(self): + # implicit int64 + rv = self.obj.emit("test-gvalue", GObject.G_MAXINT64) + self.assertEqual(rv, GObject.G_MAXINT64) + # implicit uint64 - # does not work, see https://bugzilla.gnome.org/show_bug.cgi?id=683775 - #rv = self.obj.emit("test-gvalue", GObject.G_MAXUINT64) - #self.assertEqual(rv, GObject.G_MAXUINT64) + rv = self.obj.emit("test-gvalue", GObject.G_MAXUINT64) + self.assertEqual(rv, GObject.G_MAXUINT64) def test_gvalue_ret(self): self.assertEqual(self.obj.emit("test-gvalue-ret", GObject.TYPE_INT), @@ -705,7 +705,6 @@ class TestSignalDecorator(unittest.TestCase): @GObject.SignalOverride def notify(self, *args, **kargs): self.overridden_closure_called = True - #GObject.GObject.notify(self, *args, **kargs) def on_notify(self, obj, prop): self.notify_called = True @@ -763,7 +762,6 @@ class TestSignalDecorator(unittest.TestCase): obj = self.DecoratedOverride() obj.connect("notify", obj.on_notify) self.assertEqual(obj.value, 0) - #obj.notify.emit() obj.value = 1 self.assertEqual(obj.value, 1) self.assertTrue(obj.overridden_closure_called) -- 2.34.1