[Reproducible-builds] [dh-python] 55/183: Interpreter.check_extname: do not add multiarch triplets in python3.2's extensions

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dh-python.

commit eb3cf4c6cf5ccc503332eb8ecd2b25bfbdfbd24e
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Sat Aug 3 12:42:32 2013 +0200

    Interpreter.check_extname: do not add multiarch triplets in python3.2's extensions
    
    mutliarch support was disabled in this interpreter
---
 debian/changelog          | 7 +++++++
 dhpython/interpreter.py   | 2 +-
 tests/test_interpreter.py | 8 ++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5bd0c6f..6ab25ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dh-python (1.20130803-1) UNRELEASED; urgency=low
+
+  * dh_python3: do not add multiarch triplets in python3.2's extensions -
+    mutliarch support was disabled in this interpreter
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sat, 03 Aug 2013 12:41:15 +0200
+
 dh-python (1.20130728-1) unstable; urgency=low
 
   * Upload to unstable, breaks/replaces python3 << 3.3.2-4~
diff --git a/dhpython/interpreter.py b/dhpython/interpreter.py
index 01fbd69..d32bfe5 100644
--- a/dhpython/interpreter.py
+++ b/dhpython/interpreter.py
@@ -399,7 +399,7 @@ class Interpreter:
 
         if tmp_soabi:
             result = "{}.{}".format(result, tmp_soabi)
-            if tmp_multiarch:
+            if tmp_multiarch and not (self.impl == 'cpython3' and version << '3.3'):
                 result = "{}-{}".format(result, tmp_multiarch)
         elif self.impl == 'cpython2' and version == '2.7' and tmp_multiarch:
             result = "{}.{}".format(result, tmp_multiarch)
diff --git a/tests/test_interpreter.py b/tests/test_interpreter.py
index ede13bc..832639e 100644
--- a/tests/test_interpreter.py
+++ b/tests/test_interpreter.py
@@ -77,21 +77,21 @@ class TestInterpreter(unittest.TestCase):
     def test_python32(self):
         i = Interpreter('python3.2')
         self.assertEqual(i.soabi(), 'cpython-32mu')
-        self.assertEqual(i.check_extname('foo.so'), r'foo.cpython-32mu-MYARCH.so')
+        self.assertEqual(i.check_extname('foo.so'), r'foo.cpython-32mu.so')
         self.assertIsNone(i.check_extname('foo.cpython-33m.so'))  # different version
         self.assertIsNone(i.check_extname('foo.cpython-32mu-OTHER.so'))  # different architecture
         self.assertIsNone(i.check_extname('foo.abi3.so'))
-        self.assertEqual(i.check_extname('foo/bar/bazmodule.so'), r'foo/bar/bazmodule.cpython-32mu-MYARCH.so')
+        self.assertEqual(i.check_extname('foo/bar/bazmodule.so'), r'foo/bar/bazmodule.cpython-32mu.so')
 
     @unittest.skipUnless(exists('/usr/bin/python3.2-dbg'), 'python3.2-dbg is not installed')
     def test_python32dbg(self):
         i = Interpreter('python3.2-dbg')
         self.assertEqual(i.soabi(), 'cpython-32dmu')
-        self.assertEqual(i.check_extname('foo.so'), r'foo.cpython-32dmu-MYARCH.so')
+        self.assertEqual(i.check_extname('foo.so'), r'foo.cpython-32dmu.so')
         self.assertIsNone(i.check_extname('foo.cpython-33m.so'))  # different version
         self.assertIsNone(i.check_extname('foo.cpython-32dmu-OTHER.so'))  # different architecture
         self.assertIsNone(i.check_extname('foo.abi3.so'))
-        self.assertEqual(i.check_extname('foo/bar/bazmodule.so'), r'foo/bar/bazmodule.cpython-32dmu-MYARCH.so')
+        self.assertEqual(i.check_extname('foo/bar/bazmodule.so'), r'foo/bar/bazmodule.cpython-32dmu.so')
 
     @unittest.skipUnless(exists('/usr/bin/python3.3'), 'python3.3 is not installed')
     def test_python33(self):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dh-python.git