diff -Nru reportbug-7.5.2ubuntu1/bin/querybts reportbug-7.6.0ubuntu1/bin/querybts --- reportbug-7.5.2ubuntu1/bin/querybts 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/bin/querybts 2019-12-14 21:19:17.000000000 +0000 @@ -169,7 +169,7 @@ archived=options.archived, source=options.source, mbox=options.mbox, latest_first=options.latest_first) for num in mboxbuglist: - url = debbugs.get_report_url(options.system, num, options.archived, mbox=True) + url = debbugs.get_report_url(options.system, num, options.archived, mbox=True, mboxmaint=True) try: report = urlutils.open_url(url, timeout=options.timeout) sys.stdout.write(report) @@ -177,7 +177,7 @@ print("Error while accessing mbox report (%s)." % ex, file=sys.stderr) else: num = int(m.group(1)) - url = debbugs.get_report_url(options.system, num, options.archived, mbox=True) + url = debbugs.get_report_url(options.system, num, options.archived, mbox=True, mboxmaint=True) try: report = urlutils.open_url(url, timeout=options.timeout) sys.stdout.write(report) diff -Nru reportbug-7.5.2ubuntu1/bin/reportbug reportbug-7.6.0ubuntu1/bin/reportbug --- reportbug-7.5.2ubuntu1/bin/reportbug 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/bin/reportbug 2019-12-14 21:19:17.000000000 +0000 @@ -1944,7 +1944,6 @@ detected_addr = self.options.email or utils.get_email()[1] if not detected_addr: efail("list-cc-me option specified but email address not detected") - ewrite("list-cc-me DEBUG: {}".format(detected_addr)) listcc += [detected_addr] if not listcc and mode > MODE_STANDARD and rtype == 'debbugs' and not self.options.testmode and not self.options.template and self.options.ccmenu: diff -Nru reportbug-7.5.2ubuntu1/debian/changelog reportbug-7.6.0ubuntu1/debian/changelog --- reportbug-7.5.2ubuntu1/debian/changelog 2019-02-02 03:29:46.000000000 +0000 +++ reportbug-7.6.0ubuntu1/debian/changelog 2020-02-05 01:33:09.000000000 +0000 @@ -1,3 +1,76 @@ +reportbug (7.6.0ubuntu1) focal; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - bin/reportbug: If bts=ubuntu or unconfigured, exit with an error and + refer user to "ubuntu-bug" instead. + - reportbug/__init__.py: Match reportbug version with package version. + - debian/control: Add prominent note to package description. + - debian/{rules,dirs}: Do not install .desktop file. + + -- Logan Rosen Wed, 05 Feb 2020 01:33:09 +0000 + +reportbug (7.6.0) unstable; urgency=medium + + [ Bastian Venthur ] + * Update to debianbts 2.10 + * replace mock w/ unittest.mock (available since py3.3) + + [ Salvatore Bonaccorso ] + * reportbug/debbugs.py + - allow to fill stretch-pu updates against release.d.o; Closes: #938941 + + [ Paul Gevers ] + * reportbug/debbugs.py + - Add template to unblock release.debian.org bugs + + [ Nis Martensen ] + * show name of output file in GTK+ ui; Closes: #941257 + * reportbug/debbugs.py + - do not show `newcomer` tag in novice mode; Closes: #941961 + * reportbug/ui/text_ui.py + - fix the total bug count not to be equal only to wishlist bugs; + Closes: #922014 + * reportbug/utils.py + - query dpkg status with unambiguous package name; Closes: #932383 + + [ Fabrice BAUZAC ] + * reportbug/ui/urwid_ui.py + - suggest to install python3-urwid for the urwid UI; Closes: #944562 + * reportbug/ui/gtk_ui.py + - suggest to install reportbug-gtk for the GTK+ UI; Closes: #944515 + + [ Andrei POPESCU ] + * Download and use maintainer mbox whenever applicable; Closes: #933765 + + [ Sandro Tosi ] + * doc/README.developers + - add a section describing why bugscripts are executed with LC_ALL=C; + Closes: #946326 + + -- Sandro Tosi Sat, 14 Dec 2019 13:18:07 -0500 + +reportbug (7.5.3) unstable; urgency=medium + + * debian/control + - replace emacs* Suggests with emacs-bin-common; Closes: #925422 + - bump Standards-Version to 4.4.0 (no changes needed) + - add sensible-utils dep, patch by Nis Martensen + * reportbug/debbugs.py + - when handling ftp.d.o, dont look up package information if the package + doesnt exist, fixing a crash; Closes: #923631 + - fix a crash with stable version lookup, patch by Nis Martensen; + Closes: #935602 + * bin/reportbug + - remove debug code when handling list-cc-me, patch by Josh Triplett + * reportbug/utils.py + - update release names, following Buster releases, patch by Nicolas + Braud-Santoni; Closes: #932524, #931609 + - recognize versioned Provides; patch by Nis Martensen; Closes: #934472 + * man/reportbug.1 + - add default for --draftpath; patch by laokz + + -- Sandro Tosi Wed, 28 Aug 2019 19:54:08 -0400 + reportbug (7.5.2ubuntu1) disco; urgency=medium * Merge from Debian unstable. Remaining changes: diff -Nru reportbug-7.5.2ubuntu1/debian/control reportbug-7.6.0ubuntu1/debian/control --- reportbug-7.5.2ubuntu1/debian/control 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/debian/control 2019-12-14 21:19:18.000000000 +0000 @@ -4,16 +4,16 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Reportbug Maintainers Uploaders: Sandro Tosi -Standards-Version: 4.1.2 +Standards-Version: 4.4.0 Build-Depends: debhelper (>= 10), python3, dh-python -Build-Depends-Indep: python3-nose, python3-setuptools, python3-mock +Build-Depends-Indep: python3-nose, python3-setuptools Vcs-Git: https://salsa.debian.org/reportbug-team/reportbug.git Vcs-Browser: https://salsa.debian.org/reportbug-team/reportbug Package: reportbug Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, apt, python3-reportbug (= ${source:Version}), sensible-utils -Suggests: postfix | exim4 | mail-transport-agent, gnupg | pgp, debconf-utils (>> 1.1.0), debsums (>= 2.0.47), file (>> 1.30), dlocate, python3-urwid, reportbug-gtk (= ${source:Version}), xdg-utils, emacs24-bin-common | emacs25-bin-common, claws-mail (>= 3.8.0) +Suggests: postfix | exim4 | mail-transport-agent, gnupg | pgp, debconf-utils (>> 1.1.0), debsums (>= 2.0.47), file (>> 1.30), dlocate, python3-urwid, reportbug-gtk (= ${source:Version}), xdg-utils, emacs-bin-common, claws-mail (>= 3.8.0) Description: reports bugs in the Debian distribution reportbug is a tool designed to make the reporting of bugs in Debian and derived distributions relatively painless. Its features include: @@ -40,7 +40,7 @@ Package: python3-reportbug Section: python Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, apt, python3-debian, python3-debianbts (>= 1.13), file, python3-requests, python3-apt +Depends: ${misc:Depends}, ${python3:Depends}, apt, python3-debian, python3-debianbts (>= 2.10), file, python3-requests, python3-apt, sensible-utils Suggests: reportbug Description: Python modules for interacting with bug tracking systems reportbug is a tool designed to make the reporting of bugs in Debian diff -Nru reportbug-7.5.2ubuntu1/doc/README.developers reportbug-7.6.0ubuntu1/doc/README.developers --- reportbug-7.5.2ubuntu1/doc/README.developers 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/doc/README.developers 2019-12-14 21:19:17.000000000 +0000 @@ -142,6 +142,17 @@ those headers are added to the ones already presente so a header with the same name will appear twice, since it won't replace the existing one. +Bugscripts and locale information +================================= + +Please be aware that reportbug runs every bugscript in a shell forcing +`LC_ALL=C`, this is to prevent the commands output in the script to be +unintelligible when sent via email. + +Part of reportbug "System Information" section of a bug template, already +contains the locale information, no need for your bugscript to re-discover that +information again. + Add attachments from the bugscript ================================== diff -Nru reportbug-7.5.2ubuntu1/.idea/misc.xml reportbug-7.6.0ubuntu1/.idea/misc.xml --- reportbug-7.5.2ubuntu1/.idea/misc.xml 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/.idea/misc.xml 2019-12-14 21:19:18.000000000 +0000 @@ -1,4 +1,4 @@ - + \ No newline at end of file diff -Nru reportbug-7.5.2ubuntu1/.idea/reportbug.iml reportbug-7.6.0ubuntu1/.idea/reportbug.iml --- reportbug-7.5.2ubuntu1/.idea/reportbug.iml 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/.idea/reportbug.iml 2019-12-14 21:19:18.000000000 +0000 @@ -2,7 +2,7 @@ - + \ No newline at end of file diff -Nru reportbug-7.5.2ubuntu1/.idea/workspace.xml reportbug-7.6.0ubuntu1/.idea/workspace.xml --- reportbug-7.5.2ubuntu1/.idea/workspace.xml 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/.idea/workspace.xml 2019-12-14 21:19:18.000000000 +0000 @@ -1,11 +1,10 @@ - - - + + + \ No newline at end of file diff -Nru reportbug-7.5.2ubuntu1/man/reportbug.1 reportbug-7.6.0ubuntu1/man/reportbug.1 --- reportbug-7.5.2ubuntu1/man/reportbug.1 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/man/reportbug.1 2019-12-14 21:19:18.000000000 +0000 @@ -122,7 +122,7 @@ .TP .B \-\-draftpath=DRAFTPATH Save the draft (for example, when exiting and saving the report -without reporting it) into \fIDRAFTPATH\fP directory. +without reporting it) into \fIDRAFTPATH\fP directory(default /tmp). .TP .B \-e EDITOR, \-\-editor=EDITOR Specify the editor to use, overriding any \fBEDITOR\fP or \fBVISUAL\fP diff -Nru reportbug-7.5.2ubuntu1/reportbug/debbugs.py reportbug-7.6.0ubuntu1/reportbug/debbugs.py --- reportbug-7.5.2ubuntu1/reportbug/debbugs.py 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/reportbug/debbugs.py 2019-12-14 21:19:17.000000000 +0000 @@ -261,8 +261,8 @@ 'n': 'Exit without filing a report.'}) if cont == 'n': sys.exit(1) - - section, priority = info[16], info[10] + else: + section, priority = info[16], info[10] if tag == 'override': headers.append('X-Debbugs-CC: debian-boot@lists.debian.org') @@ -412,7 +412,7 @@ 'britney': "testing migration script bugs", 'transition': "transition tracking", 'unblock': "unblock requests", - #oldstable_pu: "%s proposed updates requests" % oldstable, + oldstable_pu: "%s proposed updates requests" % oldstable, stable_pu: "%s proposed updates requests" % stable, 'rm': "Stable/Testing removal requests", 'other': "None of the other options", @@ -462,7 +462,10 @@ # FIXME: pu/rm should lookup the version elsewhere version = info and info[0] if online and tag.endswith('-pu'): - version = list(checkversions.get_versions_available(package, timeout, (tag[:-3],)).values())[0] + try: + version = list(checkversions.get_versions_available(package, timeout, (tag[:-3],)).values())[0] + except IndexError: + pass if version: cont = ui.select_options( "Latest version seems to be %s, is this the proper one ?" % (version), @@ -578,9 +581,30 @@ body = textwrap.dedent("""\ Please unblock package %s - (explain the reason for the unblock here) + (Please provide enough (but not too much) information to help + the release team to judge the request efficiently. E.g. by + filling in the sections below.) + + [ Reason ] + (Explain what the reason for the unblock request is.) + + [ Impact ] + (What is the impact for the user if the unblock isn't granted?) + + [ Tests ] + (What automated or manual tests cover the affected code?) + + [ Risks ] + (Discussion of the risks involved. E.g. code is trivial or + complex, key package vs leaf package, alternatives available.) + + [ Checklist ] + [ ] all changes are documented in the d/changelog + [ ] I reviewed all changes and I approve them + [ ] attach debdiff against the package in testing - (include/attach the debdiff against the package in testing) + [ Other info ] + (Anything else the release team should know.) unblock %s/%s """ % (package, package, version)) @@ -838,6 +862,9 @@ if mode > utils.MODE_STANDARD: tags.update(EXPERT_TAGS) + elif mode < utils.MODE_STANDARD and 'newcomer' in tags: + # do not show the newcomer tag in novice mode + del tags['newcomer'] return tags @@ -851,11 +878,11 @@ return 'no' -def cgi_report_url(system, number, archived=False, mbox=False): +def cgi_report_url(system, number, archived=False, mbox=False, mboxmaint=False): root = SYSTEMS[system].get('cgiroot') if root: - return '%sbugreport.cgi?bug=%d&archived=%s&mbox=%s' % ( - root, number, archived, yn_bool(mbox)) + return '%sbugreport.cgi?bug=%d&archived=%s&mbox=%s&mboxmaint=%s' % ( + root, number, archived, yn_bool(mbox), yn_bool(mboxmaint)) return None @@ -906,7 +933,7 @@ package_url(system, package, mirrors, source, repeatmerged)) -def get_report_url(system, number, mirrors=None, archived=False, mbox=False): +def get_report_url(system, number, mirrors=None, archived=False, mbox=False, mboxmaint=True): return (cgi_report_url(system, number, archived, mbox) or report_url(system, number, mirrors)) @@ -1063,10 +1090,9 @@ if system == 'debian': if isinstance(package, str): if source: - pkg_filter = 'src' + bugs = debianbts.get_bugs(src=package) else: - pkg_filter = 'package' - bugs = debianbts.get_bugs(pkg_filter, package) + bugs = debianbts.get_bugs(package=package) else: bugs = list(map(int, package)) @@ -1147,7 +1173,7 @@ number = int(number) if system == 'debian': - status = debianbts.get_status(number)[0] + status = debianbts.get_status([number])[0] log = debianbts.get_bug_log(number) # add Date/Subject/From headers to the msg bodies diff -Nru reportbug-7.5.2ubuntu1/reportbug/__init__.py reportbug-7.6.0ubuntu1/reportbug/__init__.py --- reportbug-7.5.2ubuntu1/reportbug/__init__.py 2019-02-02 03:29:44.000000000 +0000 +++ reportbug-7.6.0ubuntu1/reportbug/__init__.py 2020-02-05 01:32:17.000000000 +0000 @@ -25,7 +25,7 @@ __all__ = ['bugreport', 'utils', 'urlutils', 'checkbuildd', 'checkversions', 'debbugs', 'exceptions', 'submit', 'tempfile'] -VERSION_NUMBER = "7.5.2ubuntu1" +VERSION_NUMBER = "7.6.0ubuntu1" VERSION = "reportbug " + VERSION_NUMBER COPYRIGHT = VERSION + '\nCopyright (C) 1999-2008 Chris Lawrence ' + \ diff -Nru reportbug-7.5.2ubuntu1/reportbug/submit.py reportbug-7.6.0ubuntu1/reportbug/submit.py --- reportbug-7.5.2ubuntu1/reportbug/submit.py 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/reportbug/submit.py 2019-12-14 21:19:18.000000000 +0000 @@ -416,7 +416,7 @@ pipe.write(message) pipe.flush() if msgname: - ewrite("Bug report written as %s\n", msgname) + ui.long_message("Bug report written as %s\n", msgname) except IOError: failed = True pipe.close() diff -Nru reportbug-7.5.2ubuntu1/reportbug/ui/gtk_ui.py reportbug-7.6.0ubuntu1/reportbug/ui/gtk_ui.py --- reportbug-7.5.2ubuntu1/reportbug/ui/gtk_ui.py 2019-02-01 01:57:49.000000000 +0000 +++ reportbug-7.6.0ubuntu1/reportbug/ui/gtk_ui.py 2019-12-14 21:19:18.000000000 +0000 @@ -49,7 +49,7 @@ gi.require_foreign('cairo') except ImportError: - raise UINotImportable('Please install the python3-gi and gir1.2-gtk-3.0 packages to use this interface.') + raise UINotImportable('Please install the reportbug-gtk package to use this interface.') global Vte diff -Nru reportbug-7.5.2ubuntu1/reportbug/ui/text_ui.py reportbug-7.6.0ubuntu1/reportbug/ui/text_ui.py --- reportbug-7.5.2ubuntu1/reportbug/ui/text_ui.py 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/reportbug/ui/text_ui.py 2019-12-14 21:19:18.000000000 +0000 @@ -107,13 +107,13 @@ def _launch_mbox_reader(mbox_reader_cmd, bts, bugs, number, mirrors, archived, - mbox, http_proxy, timeout): + mbox, mboxmaint, http_proxy, timeout): try: number = int(number) if number not in bugs and 1 <= number <= len(bugs): number = bugs[number - 1] reportbug.utils.launch_mbox_reader(mbox_reader_cmd, - debbugs.get_report_url(bts, number, mirrors, archived, mbox), + debbugs.get_report_url(bts, number, mirrors, archived, mbox, mboxmaint), http_proxy, timeout) except ValueError: ewrite('Invalid report number: %s\n', @@ -488,7 +488,7 @@ skip_pager = True elif x == 'e': reportbug.utils.launch_mbox_reader(mbox_reader_cmd, - debbugs.get_report_url(system, number, mirrors, archived, True), + debbugs.get_report_url(system, number, mirrors, archived, True, True), http_proxy, timeout) skip_pager = True elif x == 'o': @@ -730,7 +730,7 @@ elif x == 'e': number = our_raw_input('Please enter the number of the bug you would like to view: #', allowed) _launch_mbox_reader(mbox_reader_cmd, bts, bugs, number, - mirrors, 'no', True, http_proxy, + mirrors, 'no', True, True, http_proxy, timeout) else: if x == 'm' or x == 'i': @@ -762,8 +762,8 @@ ewrite('Invalid report number: %s\n', number) - startcount = endcount + 1 - scount = 0 + startcount = endcount + 1 + scount = 0 # these now empty @@ -955,7 +955,7 @@ number = our_raw_input('Please enter the number of the ' 'bug you would like to view: #', allowed) _launch_mbox_reader(mbox_reader_cmd, bts, bugs, number, - mirrors, 'no', True, http_proxy, timeout) + mirrors, 'no', True, True, http_proxy, timeout) else: if x == 'm' or x == 'i': number = our_raw_input( diff -Nru reportbug-7.5.2ubuntu1/reportbug/ui/urwid_ui.py reportbug-7.6.0ubuntu1/reportbug/ui/urwid_ui.py --- reportbug-7.5.2ubuntu1/reportbug/ui/urwid_ui.py 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/reportbug/ui/urwid_ui.py 2019-12-14 21:19:18.000000000 +0000 @@ -42,7 +42,7 @@ import urwid.raw_display import urwid except ImportError: - raise UINotImportable('Please install the python-urwid package to use this interface.') + raise UINotImportable('Please install the python3-urwid package to use this interface.') ISATTY = sys.stdin.isatty() diff -Nru reportbug-7.5.2ubuntu1/reportbug/utils.py reportbug-7.6.0ubuntu1/reportbug/utils.py --- reportbug-7.5.2ubuntu1/reportbug/utils.py 2019-02-01 12:18:42.000000000 +0000 +++ reportbug-7.6.0ubuntu1/reportbug/utils.py 2019-12-14 21:19:17.000000000 +0000 @@ -93,13 +93,14 @@ '/usr/man', '/usr/doc', '/usr/bin'] # A map between codenames and suites -CODENAME2SUITE = {'wheezy': 'oldoldstable', - 'jessie': 'oldstable', - 'stretch': 'stable', - 'buster': 'testing', - 'bullseye': 'next-testing', - 'sid': 'unstable', - 'experimental': 'experimental'} +CODENAME2SUITE = {'wheezy': 'oldoldoldstable', + 'jessie': 'oldoldstable', + 'stretch': 'oldstable', + 'buster': 'stable', + 'bullseye': 'testing', + 'bookworm': 'next-testing', + 'sid': 'unstable', + 'experimental': 'experimental'} SUITE2CODENAME = dict([(suite, codename) for codename, suite in list(CODENAME2SUITE.items())]) @@ -365,6 +366,13 @@ output = get_command_output( "LC_ALL=C.UTF-8 apt-cache show %s 2>/dev/null" % packarg) else: + # filter through dpkg-query to automatically append arch + # qualifier in the cases where this is needed + try: + packarg = get_command_output( + "dpkg-query -W -f='${binary:Package}\n' %s 2>/dev/null" % packarg).split()[0] + except IndexError: + pass output = get_command_output( "COLUMNS=79 dpkg --status %s 2>/dev/null" % packarg) @@ -570,7 +578,7 @@ return [] packinfo = get_dpkg_database() - pkgname = r'(?:[\S]+(?:$|,\s+))' + pkgname = r'(?:[\S]+(?:\s+\(=[^()]+\))?(?:$|,\s+))' groupfor = {} searchpkgs = [] @@ -578,7 +586,7 @@ for (group, package) in packages: groupfor[package] = group escpkg = re.escape(package) - searchpkgs.append(escpkg) + searchpkgs.append(escpkg + r'(?:\s+\(=[^()]+\))?') searchbits = [ # Package regular expression @@ -614,7 +622,7 @@ continue if m.group('hdr') == 'Provides': - provides = m.group('pkg') + provides = m.group('pkg').split()[0] else: provides = None diff -Nru reportbug-7.5.2ubuntu1/test/test_bugreport.py reportbug-7.6.0ubuntu1/test/test_bugreport.py --- reportbug-7.5.2ubuntu1/test/test_bugreport.py 2019-02-01 12:18:43.000000000 +0000 +++ reportbug-7.6.0ubuntu1/test/test_bugreport.py 2019-12-14 21:19:18.000000000 +0000 @@ -38,7 +38,7 @@ self.assertNotIn('Severity: ', self.text) # test also a bugreport instance, and a datatype unconvertible to int - bug = debianbts.get_status(123456)[0] + bug = debianbts.get_status([123456])[0] self.report = bugreport(package=self.package, body=self.body, followup=bug) self.text = self.report.__unicode__() diff -Nru reportbug-7.5.2ubuntu1/test/test_checkversions.py reportbug-7.6.0ubuntu1/test/test_checkversions.py --- reportbug-7.5.2ubuntu1/test/test_checkversions.py 2019-02-01 12:18:43.000000000 +0000 +++ reportbug-7.6.0ubuntu1/test/test_checkversions.py 2019-12-14 21:19:18.000000000 +0000 @@ -1,10 +1,9 @@ import unittest +from unittest import mock from reportbug import checkversions from nose.plugins.attrib import attr -import mock - class TestCheckversions(unittest.TestCase): def test_compare_versions(self): diff -Nru reportbug-7.5.2ubuntu1/test/test_debbugs.py reportbug-7.6.0ubuntu1/test/test_debbugs.py --- reportbug-7.5.2ubuntu1/test/test_debbugs.py 2019-02-01 12:18:43.000000000 +0000 +++ reportbug-7.6.0ubuntu1/test/test_debbugs.py 2019-12-14 21:19:18.000000000 +0000 @@ -1,7 +1,7 @@ import unittest +from unittest import mock from nose.plugins.attrib import attr -import mock from reportbug import utils from reportbug import debbugs from reportbug import urlutils diff -Nru reportbug-7.5.2ubuntu1/test/test_ui_gtk.py reportbug-7.6.0ubuntu1/test/test_ui_gtk.py --- reportbug-7.5.2ubuntu1/test/test_ui_gtk.py 2019-02-01 01:57:49.000000000 +0000 +++ reportbug-7.6.0ubuntu1/test/test_ui_gtk.py 2019-12-14 21:19:18.000000000 +0000 @@ -11,7 +11,7 @@ class TestUIGTK(unittest.TestCase): @attr('network') # marking the test as using network def test_bug_class(self): - bug = debianbts.get_status(415801)[0] + bug = debianbts.get_status([415801])[0] gtk_bug = ui.Bug(bug) diff -Nru reportbug-7.5.2ubuntu1/test/test_utils.py reportbug-7.6.0ubuntu1/test/test_utils.py --- reportbug-7.5.2ubuntu1/test/test_utils.py 2019-02-01 12:18:43.000000000 +0000 +++ reportbug-7.6.0ubuntu1/test/test_utils.py 2019-12-14 21:19:18.000000000 +0000 @@ -1,12 +1,12 @@ # coding=utf-8 import unittest +from unittest import mock from reportbug import utils import os.path import platform from nose.plugins.attrib import attr import debianbts -import mock import subprocess @@ -487,7 +487,7 @@ exinfo=123456) self.assertIn('Followup-For: Bug #123456', report) - bug = debianbts.get_status(123456)[0] + bug = debianbts.get_status([123456])[0] report = utils.generate_blank_report('reportbug', '1.2.3', 'normal', '', '', '', type='debbugs', exinfo=bug)