mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-06 00:27:27 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 7f793442316599ca25014a3d39c5de56c384990f Mon Sep 17 00:00:00 2001
|
|
From: Michael Palimaka <kensington@gentoo.org>
|
|
Date: Fri, 23 May 2014 18:10:20 +1000
|
|
Subject: [PATCH] Fix tests with Python 3.
|
|
|
|
Change-Id: Ibbf54406ba33dd1f645a46d63c04269868288768
|
|
---
|
|
tests/minimalbinding/typedef_test.py | 2 +-
|
|
tests/samplebinding/overflow_test.py | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tests/minimalbinding/typedef_test.py b/tests/minimalbinding/typedef_test.py
|
|
index 089b279..b5535fb 100644
|
|
--- a/tests/minimalbinding/typedef_test.py
|
|
+++ b/tests/minimalbinding/typedef_test.py
|
|
@@ -30,7 +30,7 @@ from py3kcompat import IS_PY3K
|
|
|
|
try:
|
|
import numpy as np
|
|
-except ImportError, e:
|
|
+except ImportError:
|
|
np = None
|
|
|
|
|
|
diff --git a/tests/samplebinding/overflow_test.py b/tests/samplebinding/overflow_test.py
|
|
index 5020872..c294c13 100644
|
|
--- a/tests/samplebinding/overflow_test.py
|
|
+++ b/tests/samplebinding/overflow_test.py
|
|
@@ -45,7 +45,7 @@ class OverflowTest(unittest.TestCase):
|
|
'''C++ function receives an long long argument and raise OverflowError if the value is negative.'''
|
|
val = 100
|
|
self.assertEqual(doubleLongLong(val), 2 * val)
|
|
- val = long(100)
|
|
+ val = int(100)
|
|
self.assertEqual(doubleLongLong(val), 2 * val)
|
|
val = (2 << 64) + 1
|
|
self.assertRaises(OverflowError, doubleLongLong, val)
|
|
@@ -54,7 +54,7 @@ class OverflowTest(unittest.TestCase):
|
|
'''C++ function receives an unsigned long long argument and raise OverflowError if the value is negative.'''
|
|
val = 100
|
|
self.assertEqual(doubleUnsignedLongLong(val), 2 * val)
|
|
- val = long(100)
|
|
+ val = int(100)
|
|
self.assertEqual(doubleUnsignedLongLong(val), 2 * val)
|
|
val *= -1
|
|
self.assertRaises(OverflowError, doubleUnsignedLongLong, val)
|
|
--
|
|
2.1.0
|
|
|