diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2017-05-21 18:06:25 +0200 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2017-05-21 18:08:36 +0200 |
| commit | 24156b0b0dd29940b891bcc441cdc7fffad45142 (patch) | |
| tree | 7578008c132f6803468e9dacdaa11d95821ef33a | |
| parent | 2cfded48341a4a25d7379358c0e0a7de89df4cdd (diff) | |
overrides: Remove IntRange And Int64Range on Python2
They use the range() built-in type which is a Python 3 change.
https://bugzilla.gnome.org/show_bug.cgi?id=782927
| -rw-r--r-- | gi/overrides/Gst.py | 10 | ||||
| -rw-r--r-- | testsuite/test_int64range.py | 5 | ||||
| -rw-r--r-- | testsuite/test_intrange.py | 5 |
3 files changed, 16 insertions, 4 deletions
diff --git a/gi/overrides/Gst.py b/gi/overrides/Gst.py index 3c0805b..8704709 100644 --- a/gi/overrides/Gst.py +++ b/gi/overrides/Gst.py @@ -348,8 +348,9 @@ class IntRange(Gst.IntRange): return '[%d,%d,%d]' % (self.range.start, self.range.stop, self.range.step) -IntRange = override(IntRange) -__all__.append('IntRange') +if sys.version_info >= (3, 0): + IntRange = override(IntRange) + __all__.append('IntRange') class Int64Range(Gst.Int64Range): @@ -380,8 +381,9 @@ class Int64Range(Gst.Int64Range): self.range.step) -Int64Range = override(Int64Range) -__all__.append('Int64Range') +if sys.version_info >= (3, 0): + Int64Range = override(Int64Range) + __all__.append('Int64Range') class DoubleRange(Gst.DoubleRange): diff --git a/testsuite/test_int64range.py b/testsuite/test_int64range.py index 0a283ab..09fcff7 100644 --- a/testsuite/test_int64range.py +++ b/testsuite/test_int64range.py @@ -23,6 +23,8 @@ overrides_hack from common import TestCase +import unittest, sys + import gi gi.require_version("Gst", "1.0") from gi.repository import Gst @@ -31,6 +33,7 @@ Gst.init(None) R = Gst.Int64Range class TestInt64Range(TestCase): + @unittest.skipUnless(sys.version_info >= (3, 0), "requires Python 3") def testConstructor(self): Gst.init(None) @@ -42,11 +45,13 @@ class TestInt64Range(TestCase): self.assertRaises(TypeError, R, 1) self.assertRaises(TypeError, R) + @unittest.skipUnless(sys.version_info >= (3, 0), "requires Python 3") def testRepr(self): Gst.init(None) self.assertEquals(repr(R(range(0, 10, 2))), '<Gst.Int64Range [0,10,2]>') + @unittest.skipUnless(sys.version_info >= (3, 0), "requires Python 3") def testGetValue(self): Gst.init(None) diff --git a/testsuite/test_intrange.py b/testsuite/test_intrange.py index 050d47a..dbb4ae0 100644 --- a/testsuite/test_intrange.py +++ b/testsuite/test_intrange.py @@ -23,6 +23,8 @@ overrides_hack from common import TestCase +import unittest, sys + import gi gi.require_version("Gst", "1.0") from gi.repository import Gst @@ -31,6 +33,7 @@ Gst.init(None) R = Gst.IntRange class TestIntRange(TestCase): + @unittest.skipUnless(sys.version_info >= (3, 0), "requires Python 3") def testConstructor(self): Gst.init(None) @@ -42,11 +45,13 @@ class TestIntRange(TestCase): self.assertRaises(TypeError, R, 1) self.assertRaises(TypeError, R) + @unittest.skipUnless(sys.version_info >= (3, 0), "requires Python 3") def testRepr(self): Gst.init(None) self.assertEquals(repr(R(range(0, 10, 2))), '<Gst.IntRange [0,10,2]>') + @unittest.skipUnless(sys.version_info >= (3, 0), "requires Python 3") def testGetValue(self): Gst.init(None) |