diff -Nru dh-python-4.20191017ubuntu6/debian/changelog dh-python-4.20191017ubuntu7/debian/changelog --- dh-python-4.20191017ubuntu6/debian/changelog 2020-02-23 11:26:55.000000000 +0000 +++ dh-python-4.20191017ubuntu7/debian/changelog 2020-02-23 16:04:32.000000000 +0000 @@ -1,3 +1,9 @@ +dh-python (4.20191017ubuntu7) focal; urgency=medium + + * Also fix the nosetests. + + -- Matthias Klose Sun, 23 Feb 2020 17:04:32 +0100 + dh-python (4.20191017ubuntu6) focal; urgency=medium * Fix autopkg tests with python3.8 only. diff -Nru dh-python-4.20191017ubuntu6/dhpython/interpreter.py dh-python-4.20191017ubuntu7/dhpython/interpreter.py --- dh-python-4.20191017ubuntu6/dhpython/interpreter.py 2019-10-18 08:56:00.000000000 +0000 +++ dh-python-4.20191017ubuntu7/dhpython/interpreter.py 2020-02-23 16:04:11.000000000 +0000 @@ -307,8 +307,8 @@ >>> i = Interpreter('python') >>> i.cache_file('foo.py', Version('3.1')) 'foo.pyc' - >>> i.cache_file('bar/foo.py', '3.7') - 'bar/__pycache__/foo.cpython-37.pyc' + >>> i.cache_file('bar/foo.py', '3.8') + 'bar/__pycache__/foo.cpython-38.pyc' """ version = Version(version or self.version) last_char = 'o' if '-O' in self.options else 'c' @@ -333,8 +333,8 @@ """Return Python magic tag (used in __pycache__ dir to tag files). >>> i = Interpreter('python') - >>> i.magic_tag(version='3.7') - 'cpython-37' + >>> i.magic_tag(version='3.8') + 'cpython-38' """ version = Version(version or self.version) if self.impl.startswith('cpython') and version << Version('3.2'): @@ -376,8 +376,8 @@ >>> Interpreter('python2.7').include_dir '/usr/include/python2.7' - >>> Interpreter('python3.7-dbg').include_dir - '/usr/include/python3.7dm' + >>> Interpreter('python3.8-dbg').include_dir + '/usr/include/python3.8d' """ if self.impl == 'pypy': return '/usr/lib/pypy/include' @@ -393,10 +393,14 @@ if self.debug: if version << '3.3': result += '_d' + elif version >= '3.8': + result += 'd' else: result += 'dm' else: - if version >> '3.2': + if version >= '3.8': + pass + elif version >> '3.2': result += 'm' elif version == '3.2': result += 'mu' @@ -406,12 +410,12 @@ def symlinked_include_dir(self): """Return path to symlinked include directory. - >>> Interpreter('python3.7').symlinked_include_dir - '/usr/include/python3.7' + >>> Interpreter('python3.8').symlinked_include_dir + """ if self.impl in ('cpython2', 'pypy') or self.debug \ - or self.version << '3.3': - # these interpreters do not provide sumlink, + or self.version << '3.3' or self.version >> '3.7': + # these interpreters do not provide symlink, # others provide it in libpython3.X-dev return try: @@ -509,7 +513,7 @@ >>> Interpreter('python3.1').suggest_pkg_name('foo') 'python3-foo' - >>> Interpreter('python3.7').suggest_pkg_name('foo_bar') + >>> Interpreter('python3.8').suggest_pkg_name('foo_bar') 'python3-foo-bar' >>> Interpreter('python2.7-dbg').suggest_pkg_name('bar') 'python-bar-dbg'