[gentoo-commits] gentoo-x86 commit in dev-python/pygobject/files: pygobject-3.0.3-gobject-property-min-max.patch pygobject-3.0.3-disable-new-gi-tests.patch pygobject-3.0.3-tests-python3.patch

[Alexandre Rostovtsev (tetromino)]

tetromino    11/12/26 06:29:55

  Added:                pygobject-3.0.3-gobject-property-min-max.patch
                        pygobject-3.0.3-disable-new-gi-tests.patch
                        pygobject-3.0.3-tests-python3.patch
  Log:
  Version bump with assorted bugfixes. Fix example installation directory (bug #392449 comment 3, thanks to Arfrever). Also, restrict pypy for all versions of pygobject and improve use of python eclass in 3.0.3 (bug #321879 comment 8, thanks to Arfrever).
  
  (Portage version: 2.2.0_alpha83/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-python/pygobject/files/pygobject-3.0.3-gobject-property-min-max.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pygobject/files/pygobject-3.0.3-gobject-property-min-max.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pygobject/files/pygobject-3.0.3-gobject-property-min-max.patch?rev=1.1&content-type=text/plain

Index: pygobject-3.0.3-gobject-property-min-max.patch
===================================================================
From 00030bc6f0fb961c716ed692144cd8e4bb9be7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20P=C3=B6lsterl?= <sebp@×××××.org>
Date: Sat, 10 Dec 2011 12:51:45 +0100
Subject: [PATCH] Fixed bug where GObject.property did not respect minimum and
 maximum values

https://bugzilla.gnome.org/show_bug.cgi?id=664864
---
 gi/_gobject/propertyhelper.py |    2 +-
 tests/test_properties.py      |   31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/gi/_gobject/propertyhelper.py b/gi/_gobject/propertyhelper.py
index 4635350..9208a0b 100644
--- a/gi/_gobject/propertyhelper.py
+++ b/gi/_gobject/propertyhelper.py
@@ -298,7 +298,7 @@ class property(object):
         ptype = self.type
         if ptype in [TYPE_INT, TYPE_UINT, TYPE_LONG, TYPE_ULONG,
                      TYPE_INT64, TYPE_UINT64, TYPE_FLOAT, TYPE_DOUBLE]:
-            args = self._get_minimum(), self._get_maximum(), self.default
+            args = self.minimum, self.maximum, self.default
         elif (ptype == TYPE_STRING or ptype == TYPE_BOOLEAN or
               ptype.is_a(TYPE_ENUM)):
             args = (self.default,)
diff --git a/tests/test_properties.py b/tests/test_properties.py
index 3521647..75aacff 100644
--- a/tests/test_properties.py
+++ b/tests/test_properties.py
@@ -367,6 +367,37 @@ class TestProperty(unittest.TestCase):
                               GObject.property, type=gtype, minimum=min,
                               maximum=max+1)
 
+    def testMinMax(self):
+        class C(GObject.GObject):
+            prop_int = GObject.property(type=int, minimum=1, maximum=100, default=1)
+            prop_float = GObject.property(type=float, minimum=0.1, maximum=10.5, default=1.1)
+
+            def __init__(self):
+                GObject.GObject.__init__(self)
+
+        o = C()
+        self.assertEqual(o.prop_int, 1)
+
+        o.prop_int = 5
+        self.assertEqual(o.prop_int, 5)
+
+        o.prop_int = 0
+        self.assertEqual(o.prop_int, 5)
+
+        o.prop_int = 101
+        self.assertEqual(o.prop_int, 5)
+
+        self.assertEqual(o.prop_float, 1.1)
+
+        o.prop_float = 7.75
+        self.assertEqual(o.prop_float, 7.75)
+
+        o.prop_float = 0.09
+        self.assertEqual(o.prop_float, 7.75)
+
+        o.prop_float = 10.51
+        self.assertEqual(o.prop_float, 7.75)
+
     def testMultipleInstances(self):
         class C(GObject.GObject):
             prop = GObject.property(type=str, default='default')
-- 
1.7.8.1




1.1                  dev-python/pygobject/files/pygobject-3.0.3-disable-new-gi-tests.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pygobject/files/pygobject-3.0.3-disable-new-gi-tests.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pygobject/files/pygobject-3.0.3-disable-new-gi-tests.patch?rev=1.1&content-type=text/plain

Index: pygobject-3.0.3-disable-new-gi-tests.patch
===================================================================
Disable tests requiring >=gobject-introspection-1.31

diff --git a/tests/test_everything.py b/tests/test_everything.py
index 43735e5..ecfdef4 100644
--- a/tests/test_everything.py
+++ b/tests/test_everything.py
@@ -507,22 +507,3 @@ class TestAdvancedInterfaces(unittest.TestCase):
         self.assertEquals(ret[0], 51);
         self.assertEquals(ret[1], 61);
         self.assertEquals(ret[2], 32);
-
-    def test_obj_skip_return_val_no_out(self):
-        obj = Everything.TestObj();
-        # raises an error for 0, succeeds for any other value
-        self.assertRaises(GLib.GError, obj.skip_return_val_no_out, 0)
-
-        ret = obj.skip_return_val_no_out(1)
-        self.assertEquals(ret, None)
-
-class TestSignals(unittest.TestCase):
-    def test_object_param_signal(self):
-        obj = Everything.TestObj();
-
-        def callback (obj_param):
-            self.assertEquals(obj_param.props.int, 3)
-            self.assertEquals(obj_param.__grefcount__, 2)
-
-        obj.connect('sig-with-obj', callback)
-        obj.emit_sig_with_obj()
diff --git a/tests/test_gi.py b/tests/test_gi.py
index 0a9b1b2..7e24778 100644
--- a/tests/test_gi.py
+++ b/tests/test_gi.py
@@ -770,18 +770,6 @@ class TestArray(unittest.TestCase):
     def test_gstrv_inout(self):
         self.assertEquals(['-1', '0', '1', '2'], GIMarshallingTests.gstrv_inout(['0', '1', '2']))
     
-    def test_array_gvariant_none_in(self):
-        v = [GLib.Variant("i", 27), GLib.Variant("s", "Hello")]
-        self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
-    
-    def test_array_gvariant_container_in(self):
-        v = [GLib.Variant("i", 27), GLib.Variant("s", "Hello")]
-        self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
-    
-    def test_array_gvariant_full_in(self):
-        v = [GLib.Variant("i", 27), GLib.Variant("s", "Hello")]
-        self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
-
     def test_bytearray_gvariant(self):
         v = GLib.Variant.new_bytestring("foo")
         self.assertEquals(v.get_bytestring(), "foo")
@@ -1651,16 +1639,6 @@ class TestPythonGObject(unittest.TestCase):
             def do_method_not_a_vfunc(self):
                 pass
 
-    def test_subsubobject(self):
-        class SubSubSubObject(GIMarshallingTests.SubSubObject):
-            def do_method_deep_hierarchy(self, num):
-                self.props.int = num * 2
-
-        sub_sub_sub_object = SubSubSubObject()
-        GIMarshallingTests.SubSubObject.do_method_deep_hierarchy(sub_sub_sub_object, 5)
-        self.assertEqual(sub_sub_sub_object.props.int, 5)
-
-
 class TestMultiOutputArgs(unittest.TestCase):
 
     def test_int_out_out(self):



1.1                  dev-python/pygobject/files/pygobject-3.0.3-tests-python3.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pygobject/files/pygobject-3.0.3-tests-python3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pygobject/files/pygobject-3.0.3-tests-python3.patch?rev=1.1&content-type=text/plain

Index: pygobject-3.0.3-tests-python3.patch
===================================================================
From 8d88283688797b8fc70a7cbccd42a71b8518098d Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@g.o>
Date: Mon, 26 Dec 2011 00:44:56 -0500
Subject: [PATCH] Fix bytearray test compatibility with python3

https://bugs.gentoo.org/show_bug.cgi?id=321879
---
 tests/test_gi.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_gi.py b/tests/test_gi.py
index 0a9b1b2..8726187 100644
--- a/tests/test_gi.py
+++ b/tests/test_gi.py
@@ -783,8 +783,8 @@ class TestArray(unittest.TestCase):
         self.assertEquals([27, "Hello"], map(GLib.Variant.unpack, GIMarshallingTests.array_gvariant_none_in(v)))
 
     def test_bytearray_gvariant(self):
-        v = GLib.Variant.new_bytestring("foo")
-        self.assertEquals(v.get_bytestring(), "foo")
+        v = GLib.Variant.new_bytestring(b"foo")
+        self.assertEquals(v.get_bytestring(), b"foo")
 
 class TestGArray(unittest.TestCase):
 
-- 
1.7.8.1