Diff of the two buildlogs:

--
--- b1/build.log	2020-10-28 23:47:53.899118442 +0000
+++ b2/build.log	2020-10-28 23:51:32.405763901 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Wed Oct 28 11:44:58 -12 2020
-I: pbuilder-time-stamp: 1603928698
+I: Current time: Thu Oct 29 13:48:04 +14 2020
+I: pbuilder-time-stamp: 1603928884
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/buster-reproducible-base.tgz]
 I: copying local configuration
@@ -17,7 +17,7 @@
 I: Extracting source
 gpgv: unknown type of key resource 'trustedkeys.kbx'
 gpgv: keyblock resource '/root/.gnupg/trustedkeys.kbx': General error
-gpgv: Signature made Mon Jan 14 02:39:24 2019 -12
+gpgv: Signature made Tue Jan 15 04:39:24 2019 +14
 gpgv:                using RSA key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F
 gpgv: Can't check signature: No public key
 dpkg-source: warning: failed to verify signature on ./tap.py_2.5-2.dsc
@@ -28,136 +28,170 @@
 dpkg-source: info: applying 0001-Fix-typo-in-man-page.patch
 I: Not using root during the build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/23675/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/22973/tmp/hooks/D01_modify_environment starting
+debug: Running on jtx1a.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+Removing 'diversion of /bin/sh to /bin/sh.distrib by dash'
+Adding 'diversion of /bin/sh to /bin/sh.distrib by bash'
+Removing 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by dash'
+Adding 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by bash'
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/22973/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/22973/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='armhf'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=3'
-  DISTRIBUTION=''
-  HOME='/root'
-  HOST_ARCH='armhf'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="0" [2]="3" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf")
+  BASH_VERSION='5.0.3(1)-release'
+  BUILDDIR=/build
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=armhf
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=4'
+  DIRSTACK=()
+  DISTRIBUTION=
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=arm
+  HOST_ARCH=armhf
   IFS=' 	
   '
-  INVOCATION_ID='e3bd6e938f2340d8be119261cc7f1263'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='23675'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=5306d734eab4482ebb59aed91a77777e
+  LANG=C
+  LANGUAGE=it_CH:it
+  LC_ALL=C
+  MACHTYPE=arm-unknown-linux-gnueabihf
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnueabihf
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=22973
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/tmp.1QHCuuibwG/pbuilderrc_lnOQ --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.1QHCuuibwG/b1 --logfile b1/build.log tap.py_2.5-2.dsc'
-  SUDO_GID='116'
-  SUDO_UID='111'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://10.0.0.15:8000/'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/tmp.1QHCuuibwG/pbuilderrc_3EZj --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.1QHCuuibwG/b2 --logfile b2/build.log tap.py_2.5-2.dsc'
+  SUDO_GID=114
+  SUDO_UID=109
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://10.0.0.15:8000/
 I: uname -a
-  Linux bbx15 4.19.0-12-armmp-lpae #1 SMP Debian 4.19.152-1 (2020-10-18) armv7l GNU/Linux
+  Linux i-capture-the-hostname 4.19.0-12-arm64 #1 SMP Debian 4.19.152-1 (2020-10-18) aarch64 GNU/Linux
 I: ls -l /bin
   total 3328
-  -rwxr-xr-x 1 root root 767656 Apr 17  2019 bash
-  -rwxr-xr-x 3 root root  26052 Jul 10  2019 bunzip2
-  -rwxr-xr-x 3 root root  26052 Jul 10  2019 bzcat
-  lrwxrwxrwx 1 root root      6 Jul 10  2019 bzcmp -> bzdiff
-  -rwxr-xr-x 1 root root   2227 Jul 10  2019 bzdiff
-  lrwxrwxrwx 1 root root      6 Jul 10  2019 bzegrep -> bzgrep
-  -rwxr-xr-x 1 root root   4877 Jun 24  2019 bzexe
-  lrwxrwxrwx 1 root root      6 Jul 10  2019 bzfgrep -> bzgrep
-  -rwxr-xr-x 1 root root   3641 Jul 10  2019 bzgrep
-  -rwxr-xr-x 3 root root  26052 Jul 10  2019 bzip2
-  -rwxr-xr-x 1 root root   9636 Jul 10  2019 bzip2recover
-  lrwxrwxrwx 1 root root      6 Jul 10  2019 bzless -> bzmore
-  -rwxr-xr-x 1 root root   1297 Jul 10  2019 bzmore
-  -rwxr-xr-x 1 root root  22432 Feb 28  2019 cat
-  -rwxr-xr-x 1 root root  38868 Feb 28  2019 chgrp
-  -rwxr-xr-x 1 root root  38836 Feb 28  2019 chmod
-  -rwxr-xr-x 1 root root  42972 Feb 28  2019 chown
-  -rwxr-xr-x 1 root root  88376 Feb 28  2019 cp
-  -rwxr-xr-x 1 root root  75516 Jan 17  2019 dash
-  -rwxr-xr-x 1 root root  71648 Feb 28  2019 date
-  -rwxr-xr-x 1 root root  51212 Feb 28  2019 dd
-  -rwxr-xr-x 1 root root  55672 Feb 28  2019 df
-  -rwxr-xr-x 1 root root  88444 Feb 28  2019 dir
-  -rwxr-xr-x 1 root root  54872 Jan  9  2019 dmesg
-  lrwxrwxrwx 1 root root      8 Sep 26  2018 dnsdomainname -> hostname
-  lrwxrwxrwx 1 root root      8 Sep 26  2018 domainname -> hostname
-  -rwxr-xr-x 1 root root  22364 Feb 28  2019 echo
-  -rwxr-xr-x 1 root root     28 Jan  7  2019 egrep
-  -rwxr-xr-x 1 root root  18260 Feb 28  2019 false
-  -rwxr-xr-x 1 root root     28 Jan  7  2019 fgrep
-  -rwxr-xr-x 1 root root  47356 Jan  9  2019 findmnt
-  -rwsr-xr-x 1 root root  21980 Apr 22  2020 fusermount
-  -rwxr-xr-x 1 root root 124508 Jan  7  2019 grep
-  -rwxr-xr-x 2 root root   2345 Jan  5  2019 gunzip
-  -rwxr-xr-x 1 root root   6375 Jan  5  2019 gzexe
-  -rwxr-xr-x 1 root root  64232 Jan  5  2019 gzip
-  -rwxr-xr-x 1 root root  13784 Sep 26  2018 hostname
-  -rwxr-xr-x 1 root root  43044 Feb 28  2019 ln
-  -rwxr-xr-x 1 root root  34932 Jul 26  2018 login
-  -rwxr-xr-x 1 root root  88444 Feb 28  2019 ls
-  -rwxr-xr-x 1 root root  67036 Jan  9  2019 lsblk
-  -rwxr-xr-x 1 root root  47168 Feb 28  2019 mkdir
-  -rwxr-xr-x 1 root root  43040 Feb 28  2019 mknod
-  -rwxr-xr-x 1 root root  26552 Feb 28  2019 mktemp
-  -rwxr-xr-x 1 root root  26024 Jan  9  2019 more
-  -rwsr-xr-x 1 root root  34268 Jan  9  2019 mount
-  -rwxr-xr-x 1 root root   9688 Jan  9  2019 mountpoint
-  -rwxr-xr-x 1 root root  84284 Feb 28  2019 mv
-  lrwxrwxrwx 1 root root      8 Sep 26  2018 nisdomainname -> hostname
-  lrwxrwxrwx 1 root root     14 Feb 14  2019 pidof -> /sbin/killall5
-  -rwxr-xr-x 1 root root  22416 Feb 28  2019 pwd
-  lrwxrwxrwx 1 root root      4 Apr 17  2019 rbash -> bash
-  -rwxr-xr-x 1 root root  26504 Feb 28  2019 readlink
-  -rwxr-xr-x 1 root root  42968 Feb 28  2019 rm
-  -rwxr-xr-x 1 root root  26496 Feb 28  2019 rmdir
-  -rwxr-xr-x 1 root root  14136 Jan 21  2019 run-parts
-  -rwxr-xr-x 1 root root  76012 Dec 22  2018 sed
-  lrwxrwxrwx 1 root root      4 Oct 20 20:25 sh -> dash
-  -rwxr-xr-x 1 root root  22384 Feb 28  2019 sleep
-  -rwxr-xr-x 1 root root  51124 Feb 28  2019 stty
-  -rwsr-xr-x 1 root root  42472 Jan  9  2019 su
-  -rwxr-xr-x 1 root root  22392 Feb 28  2019 sync
-  -rwxr-xr-x 1 root root 283324 Apr 23  2019 tar
-  -rwxr-xr-x 1 root root   9808 Jan 21  2019 tempfile
-  -rwxr-xr-x 1 root root  63464 Feb 28  2019 touch
-  -rwxr-xr-x 1 root root  18260 Feb 28  2019 true
-  -rwxr-xr-x 1 root root   9636 Apr 22  2020 ulockmgr_server
-  -rwsr-xr-x 1 root root  21976 Jan  9  2019 umount
-  -rwxr-xr-x 1 root root  22380 Feb 28  2019 uname
-  -rwxr-xr-x 2 root root   2345 Jan  5  2019 uncompress
-  -rwxr-xr-x 1 root root  88444 Feb 28  2019 vdir
-  -rwxr-xr-x 1 root root  21980 Jan  9  2019 wdctl
-  -rwxr-xr-x 1 root root    946 Jan 21  2019 which
-  lrwxrwxrwx 1 root root      8 Sep 26  2018 ypdomainname -> hostname
-  -rwxr-xr-x 1 root root   1983 Jan  5  2019 zcat
-  -rwxr-xr-x 1 root root   1677 Jan  5  2019 zcmp
-  -rwxr-xr-x 1 root root   5879 Jan  5  2019 zdiff
-  -rwxr-xr-x 1 root root     29 Jan  5  2019 zegrep
-  -rwxr-xr-x 1 root root     29 Jan  5  2019 zfgrep
-  -rwxr-xr-x 1 root root   2080 Jan  5  2019 zforce
-  -rwxr-xr-x 1 root root   7584 Jan  5  2019 zgrep
-  -rwxr-xr-x 1 root root   2205 Jan  5  2019 zless
-  -rwxr-xr-x 1 root root   1841 Jan  5  2019 zmore
-  -rwxr-xr-x 1 root root   4552 Jan  5  2019 znew
-I: user script /srv/workspace/pbuilder/23675/tmp/hooks/D02_print_environment finished
+  -rwxr-xr-x 1 root root 767656 Apr 18  2019 bash
+  -rwxr-xr-x 3 root root  26052 Jul 11  2019 bunzip2
+  -rwxr-xr-x 3 root root  26052 Jul 11  2019 bzcat
+  lrwxrwxrwx 1 root root      6 Jul 11  2019 bzcmp -> bzdiff
+  -rwxr-xr-x 1 root root   2227 Jul 11  2019 bzdiff
+  lrwxrwxrwx 1 root root      6 Jul 11  2019 bzegrep -> bzgrep
+  -rwxr-xr-x 1 root root   4877 Jun 25  2019 bzexe
+  lrwxrwxrwx 1 root root      6 Jul 11  2019 bzfgrep -> bzgrep
+  -rwxr-xr-x 1 root root   3641 Jul 11  2019 bzgrep
+  -rwxr-xr-x 3 root root  26052 Jul 11  2019 bzip2
+  -rwxr-xr-x 1 root root   9636 Jul 11  2019 bzip2recover
+  lrwxrwxrwx 1 root root      6 Jul 11  2019 bzless -> bzmore
+  -rwxr-xr-x 1 root root   1297 Jul 11  2019 bzmore
+  -rwxr-xr-x 1 root root  22432 Mar  1  2019 cat
+  -rwxr-xr-x 1 root root  38868 Mar  1  2019 chgrp
+  -rwxr-xr-x 1 root root  38836 Mar  1  2019 chmod
+  -rwxr-xr-x 1 root root  42972 Mar  1  2019 chown
+  -rwxr-xr-x 1 root root  88376 Mar  1  2019 cp
+  -rwxr-xr-x 1 root root  75516 Jan 18  2019 dash
+  -rwxr-xr-x 1 root root  71648 Mar  1  2019 date
+  -rwxr-xr-x 1 root root  51212 Mar  1  2019 dd
+  -rwxr-xr-x 1 root root  55672 Mar  1  2019 df
+  -rwxr-xr-x 1 root root  88444 Mar  1  2019 dir
+  -rwxr-xr-x 1 root root  54872 Jan 10  2019 dmesg
+  lrwxrwxrwx 1 root root      8 Sep 27  2018 dnsdomainname -> hostname
+  lrwxrwxrwx 1 root root      8 Sep 27  2018 domainname -> hostname
+  -rwxr-xr-x 1 root root  22364 Mar  1  2019 echo
+  -rwxr-xr-x 1 root root     28 Jan  8  2019 egrep
+  -rwxr-xr-x 1 root root  18260 Mar  1  2019 false
+  -rwxr-xr-x 1 root root     28 Jan  8  2019 fgrep
+  -rwxr-xr-x 1 root root  47356 Jan 10  2019 findmnt
+  -rwsr-xr-x 1 root root  21980 Apr 23  2020 fusermount
+  -rwxr-xr-x 1 root root 124508 Jan  8  2019 grep
+  -rwxr-xr-x 2 root root   2345 Jan  6  2019 gunzip
+  -rwxr-xr-x 1 root root   6375 Jan  6  2019 gzexe
+  -rwxr-xr-x 1 root root  64232 Jan  6  2019 gzip
+  -rwxr-xr-x 1 root root  13784 Sep 27  2018 hostname
+  -rwxr-xr-x 1 root root  43044 Mar  1  2019 ln
+  -rwxr-xr-x 1 root root  34932 Jul 27  2018 login
+  -rwxr-xr-x 1 root root  88444 Mar  1  2019 ls
+  -rwxr-xr-x 1 root root  67036 Jan 10  2019 lsblk
+  -rwxr-xr-x 1 root root  47168 Mar  1  2019 mkdir
+  -rwxr-xr-x 1 root root  43040 Mar  1  2019 mknod
+  -rwxr-xr-x 1 root root  26552 Mar  1  2019 mktemp
+  -rwxr-xr-x 1 root root  26024 Jan 10  2019 more
+  -rwsr-xr-x 1 root root  34268 Jan 10  2019 mount
+  -rwxr-xr-x 1 root root   9688 Jan 10  2019 mountpoint
+  -rwxr-xr-x 1 root root  84284 Mar  1  2019 mv
+  lrwxrwxrwx 1 root root      8 Sep 27  2018 nisdomainname -> hostname
+  lrwxrwxrwx 1 root root     14 Feb 15  2019 pidof -> /sbin/killall5
+  -rwxr-xr-x 1 root root  22416 Mar  1  2019 pwd
+  lrwxrwxrwx 1 root root      4 Apr 18  2019 rbash -> bash
+  -rwxr-xr-x 1 root root  26504 Mar  1  2019 readlink
+  -rwxr-xr-x 1 root root  42968 Mar  1  2019 rm
+  -rwxr-xr-x 1 root root  26496 Mar  1  2019 rmdir
+  -rwxr-xr-x 1 root root  14136 Jan 22  2019 run-parts
+  -rwxr-xr-x 1 root root  76012 Dec 23  2018 sed
+  lrwxrwxrwx 1 root root      4 Oct 29 13:48 sh -> bash
+  lrwxrwxrwx 1 root root      4 Oct 21 22:26 sh.distrib -> dash
+  -rwxr-xr-x 1 root root  22384 Mar  1  2019 sleep
+  -rwxr-xr-x 1 root root  51124 Mar  1  2019 stty
+  -rwsr-xr-x 1 root root  42472 Jan 10  2019 su
+  -rwxr-xr-x 1 root root  22392 Mar  1  2019 sync
+  -rwxr-xr-x 1 root root 283324 Apr 24  2019 tar
+  -rwxr-xr-x 1 root root   9808 Jan 22  2019 tempfile
+  -rwxr-xr-x 1 root root  63464 Mar  1  2019 touch
+  -rwxr-xr-x 1 root root  18260 Mar  1  2019 true
+  -rwxr-xr-x 1 root root   9636 Apr 23  2020 ulockmgr_server
+  -rwsr-xr-x 1 root root  21976 Jan 10  2019 umount
+  -rwxr-xr-x 1 root root  22380 Mar  1  2019 uname
+  -rwxr-xr-x 2 root root   2345 Jan  6  2019 uncompress
+  -rwxr-xr-x 1 root root  88444 Mar  1  2019 vdir
+  -rwxr-xr-x 1 root root  21980 Jan 10  2019 wdctl
+  -rwxr-xr-x 1 root root    946 Jan 22  2019 which
+  lrwxrwxrwx 1 root root      8 Sep 27  2018 ypdomainname -> hostname
+  -rwxr-xr-x 1 root root   1983 Jan  6  2019 zcat
+  -rwxr-xr-x 1 root root   1677 Jan  6  2019 zcmp
+  -rwxr-xr-x 1 root root   5879 Jan  6  2019 zdiff
+  -rwxr-xr-x 1 root root     29 Jan  6  2019 zegrep
+  -rwxr-xr-x 1 root root     29 Jan  6  2019 zfgrep
+  -rwxr-xr-x 1 root root   2080 Jan  6  2019 zforce
+  -rwxr-xr-x 1 root root   7584 Jan  6  2019 zgrep
+  -rwxr-xr-x 1 root root   2205 Jan  6  2019 zless
+  -rwxr-xr-x 1 root root   1841 Jan  6  2019 zmore
+  -rwxr-xr-x 1 root root   4552 Jan  6  2019 znew
+I: user script /srv/workspace/pbuilder/22973/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -334,7 +368,7 @@
 Get: 107 http://deb.debian.org/debian buster/main armhf sphinx-common all 1.8.4-1 [500 kB]
 Get: 108 http://deb.debian.org/debian buster/main armhf python3-sphinx all 1.8.4-1 [481 kB]
 Get: 109 http://deb.debian.org/debian buster/main armhf python3-yaml armhf 3.13-2 [113 kB]
-Fetched 39.0 MB in 6s (7057 kB/s)
+Fetched 39.0 MB in 5s (8382 kB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package libbsd0:armhf.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 18932 files and directories currently installed.)
@@ -835,7 +869,7 @@
 Building tag database...
  -> Finished parsing the build-deps
 I: Building the package
-I: Running cd /build/tap.py-2.5/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b
+I: Running cd /build/tap.py-2.5/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b
 dpkg-buildpackage: info: source package tap.py
 dpkg-buildpackage: info: source version 2.5-2
 dpkg-buildpackage: info: source distribution unstable
@@ -881,45 +915,45 @@
 running build
 running build_py
 running compile_catalog
-compiling catalog tap/locale/ja/LC_MESSAGES/tappy.po to tap/locale/ja/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/zh/LC_MESSAGES/tappy.po to tap/locale/zh/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/ru/LC_MESSAGES/tappy.po to tap/locale/ru/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/it/LC_MESSAGES/tappy.po to tap/locale/it/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/ar/LC_MESSAGES/tappy.po to tap/locale/ar/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/nl/LC_MESSAGES/tappy.po to tap/locale/nl/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/fr/LC_MESSAGES/tappy.po to tap/locale/fr/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/ar/LC_MESSAGES/tappy.po to tap/locale/ar/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/pt/LC_MESSAGES/tappy.po to tap/locale/pt/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/de/LC_MESSAGES/tappy.po to tap/locale/de/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/nl/LC_MESSAGES/tappy.po to tap/locale/nl/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/es/LC_MESSAGES/tappy.po to tap/locale/es/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/ja/LC_MESSAGES/tappy.po to tap/locale/ja/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/ru/LC_MESSAGES/tappy.po to tap/locale/ru/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/zh/LC_MESSAGES/tappy.po to tap/locale/zh/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/it/LC_MESSAGES/tappy.po to tap/locale/it/LC_MESSAGES/tappy.mo
 creating /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
-copying tap/i18n.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
 copying tap/runner.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
-copying tap/adapter.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
-copying tap/parser.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
-copying tap/formatter.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
+copying tap/line.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
 copying tap/__init__.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
-copying tap/main.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
-copying tap/rules.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
 copying tap/tracker.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
-copying tap/line.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
+copying tap/main.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
+copying tap/i18n.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
+copying tap/parser.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
 copying tap/directive.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
 copying tap/loader.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
+copying tap/formatter.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
+copying tap/rules.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
+copying tap/adapter.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap
 creating /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
-copying tap/tests/test_result.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
-copying tap/tests/test_parser.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
-copying tap/tests/run.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
+copying tap/tests/test_adapter.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
 copying tap/tests/test_main.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
 copying tap/tests/test_formatter.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
 copying tap/tests/test_loader.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
+copying tap/tests/__init__.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
 copying tap/tests/factory.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
-copying tap/tests/test_directive.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
 copying tap/tests/testcase.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
-copying tap/tests/__init__.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
+copying tap/tests/test_runner.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
+copying tap/tests/test_directive.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
 copying tap/tests/test_rules.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
-copying tap/tests/test_adapter.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
-copying tap/tests/test_line.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
+copying tap/tests/test_parser.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
 copying tap/tests/test_tracker.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
-copying tap/tests/test_runner.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
+copying tap/tests/run.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
+copying tap/tests/test_line.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
+copying tap/tests/test_result.py -> /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests
 running egg_info
 writing requirements to tap.py.egg-info/requires.txt
 writing tap.py.egg-info/PKG-INFO
@@ -976,45 +1010,45 @@
 running build
 running build_py
 running compile_catalog
-compiling catalog tap/locale/ja/LC_MESSAGES/tappy.po to tap/locale/ja/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/zh/LC_MESSAGES/tappy.po to tap/locale/zh/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/ru/LC_MESSAGES/tappy.po to tap/locale/ru/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/it/LC_MESSAGES/tappy.po to tap/locale/it/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/ar/LC_MESSAGES/tappy.po to tap/locale/ar/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/nl/LC_MESSAGES/tappy.po to tap/locale/nl/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/fr/LC_MESSAGES/tappy.po to tap/locale/fr/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/ar/LC_MESSAGES/tappy.po to tap/locale/ar/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/pt/LC_MESSAGES/tappy.po to tap/locale/pt/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/de/LC_MESSAGES/tappy.po to tap/locale/de/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/nl/LC_MESSAGES/tappy.po to tap/locale/nl/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/es/LC_MESSAGES/tappy.po to tap/locale/es/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/ja/LC_MESSAGES/tappy.po to tap/locale/ja/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/ru/LC_MESSAGES/tappy.po to tap/locale/ru/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/zh/LC_MESSAGES/tappy.po to tap/locale/zh/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/it/LC_MESSAGES/tappy.po to tap/locale/it/LC_MESSAGES/tappy.mo
 creating /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
-copying tap/i18n.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
 copying tap/runner.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
-copying tap/adapter.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
-copying tap/parser.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
-copying tap/formatter.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
+copying tap/line.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
 copying tap/__init__.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
-copying tap/main.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
-copying tap/rules.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
 copying tap/tracker.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
-copying tap/line.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
+copying tap/main.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
+copying tap/i18n.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
+copying tap/parser.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
 copying tap/directive.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
 copying tap/loader.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
+copying tap/formatter.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
+copying tap/rules.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
+copying tap/adapter.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap
 creating /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
-copying tap/tests/test_result.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
-copying tap/tests/test_parser.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
-copying tap/tests/run.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
+copying tap/tests/test_adapter.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
 copying tap/tests/test_main.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
 copying tap/tests/test_formatter.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
 copying tap/tests/test_loader.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
+copying tap/tests/__init__.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
 copying tap/tests/factory.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
-copying tap/tests/test_directive.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
 copying tap/tests/testcase.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
-copying tap/tests/__init__.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
+copying tap/tests/test_runner.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
+copying tap/tests/test_directive.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
 copying tap/tests/test_rules.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
-copying tap/tests/test_adapter.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
-copying tap/tests/test_line.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
+copying tap/tests/test_parser.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
 copying tap/tests/test_tracker.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
-copying tap/tests/test_runner.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
+copying tap/tests/run.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
+copying tap/tests/test_line.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
+copying tap/tests/test_result.py -> /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests
 running egg_info
 writing tap.py.egg-info/PKG-INFO
 writing dependency_links to tap.py.egg-info/dependency_links.txt
@@ -1149,12 +1183,64 @@
 no previously-included directories found matching 'docs/_build'
 writing manifest file 'tap.py.egg-info/SOURCES.txt'
 running build_ext
-test_adds_error (tap.tests.test_result.TestTAPTestResult) ... ok
-test_adds_expected_failure (tap.tests.test_result.TestTAPTestResult) ... ok
-test_adds_failure (tap.tests.test_result.TestTAPTestResult) ... ok
-test_adds_skip (tap.tests.test_result.TestTAPTestResult) ... ok
-test_adds_success (tap.tests.test_result.TestTAPTestResult) ... ok
-test_adds_unexpected_success (tap.tests.test_result.TestTAPTestResult) ... ok
+test_adapter_has_filename (tap.tests.test_adapter.TestAdapter)
+The adapter has a TAP filename. ... ok
+test_handles_not_ok_todo_test_line (tap.tests.test_adapter.TestAdapter)
+Add an expected failure for a not ok todo test line. ... ok
+test_handles_ok_test_line (tap.tests.test_adapter.TestAdapter)
+Add a success for an ok test line. ... ok
+test_handles_ok_todo_test_line (tap.tests.test_adapter.TestAdapter)
+Add an unexpected success for an ok todo test line. ... ok
+test_handles_skip_test_line (tap.tests.test_adapter.TestAdapter)
+Add a skip when a test line contains a skip directive. ... ok
+test_build_suite_from_stdin (tap.tests.test_main.TestMain) ... ok
+test_build_suite_from_stdin_dash (tap.tests.test_main.TestMain) ... ok
+test_exits_with_error (tap.tests.test_main.TestMain)
+The main function returns an error status if there were failures. ... ok
+test_get_successful_status (tap.tests.test_main.TestMain) ... ok
+test_when_no_pipe_to_stdin (tap.tests.test_main.TestMain) ... ok
+test_format_exception_as_diagnostics (tap.tests.test_formatter.TestFormatter) ... ok
+test_formats_as_diagnostics (tap.tests.test_formatter.TestFormatter) ... ok
+test_errors_with_multiple_version_lines (tap.tests.test_loader.TestLoader) ... ok
+test_errors_with_version_not_on_first_line (tap.tests.test_loader.TestLoader) ... ok
+test_file_does_not_exist (tap.tests.test_loader.TestLoader)
+The loader records a failure when a file does not exist. ... ok
+test_handles_directory (tap.tests.test_loader.TestLoader) ... ok
+test_handles_file (tap.tests.test_loader.TestLoader)
+The loader handles a file. ... ok
+test_loads_from_stream (tap.tests.test_loader.TestLoader) ... ok
+test_skip_plan_aborts_loading (tap.tests.test_loader.TestLoader) ... ok
+test_bad_format_string (tap.tests.test_runner.TestTAPTestRunner)
+A bad format string exits the runner. ... ok
+test_has_tap_test_result (tap.tests.test_runner.TestTAPTestRunner) ... ok
+test_runner_sets_tracker_for_streaming (tap.tests.test_runner.TestTAPTestRunner)
+The tracker is set for streaming mode. ... ok
+test_runner_stream_to_devnull_for_streaming (tap.tests.test_runner.TestTAPTestRunner) ... ok
+test_runner_uses_combined (tap.tests.test_runner.TestTAPTestRunner)
+Test that output is combined. ... ok
+test_runner_uses_format (tap.tests.test_runner.TestTAPTestRunner)
+Test that format is set on TAPTestResult FORMAT. ... ok
+test_runner_uses_header (tap.tests.test_runner.TestTAPTestRunner)
+Test that the case header can be turned off. ... ok
+test_runner_uses_outdir (tap.tests.test_runner.TestTAPTestRunner)
+Test that the test runner sets the outdir so that TAP ... ok
+test_finds_simplest_skip (tap.tests.test_directive.TestDirective) ... ok
+test_finds_simplest_todo (tap.tests.test_directive.TestDirective) ... ok
+test_finds_skip (tap.tests.test_directive.TestDirective) ... ok
+test_finds_todo (tap.tests.test_directive.TestDirective) ... ok
+test_skip_at_beginning (tap.tests.test_directive.TestDirective)
+Only match SKIP directives at the beginning. ... ok
+test_todo_has_boundary (tap.tests.test_directive.TestDirective)
+TAP spec indicates TODO directives must be on a boundary. ... ok
+test_errors_on_bail (tap.tests.test_rules.TestRules) ... ok
+test_errors_plan_not_at_end (tap.tests.test_rules.TestRules) ... ok
+test_errors_when_expected_tests_differs_from_actual (tap.tests.test_rules.TestRules) ... ok
+test_handles_skipping_plan (tap.tests.test_rules.TestRules) ... ok
+test_only_one_plan (tap.tests.test_rules.TestRules) ... ok
+test_plan_line_two (tap.tests.test_rules.TestRules)
+A plan may appear on line 2 when line 1 is a version line. ... ok
+test_requires_plan (tap.tests.test_rules.TestRules) ... ok
+test_tracks_plan_line (tap.tests.test_rules.TestRules) ... ok
 test_after_hash_is_not_description (tap.tests.test_parser.TestParser) ... ok
 test_bail_out_line (tap.tests.test_parser.TestParser)
 The parser extracts a bail out line. ... ok
@@ -1193,57 +1279,6 @@
 test_parses_yaml_no_start (tap.tests.test_parser.TestParser) ... ok
 test_unrecognizable_line (tap.tests.test_parser.TestParser)
 The parser returns an unrecognizable line. ... ok
-test_build_suite_from_stdin (tap.tests.test_main.TestMain) ... ok
-test_build_suite_from_stdin_dash (tap.tests.test_main.TestMain) ... ok
-test_exits_with_error (tap.tests.test_main.TestMain)
-The main function returns an error status if there were failures. ... ok
-test_get_successful_status (tap.tests.test_main.TestMain) ... ok
-test_when_no_pipe_to_stdin (tap.tests.test_main.TestMain) ... ok
-test_format_exception_as_diagnostics (tap.tests.test_formatter.TestFormatter) ... ok
-test_formats_as_diagnostics (tap.tests.test_formatter.TestFormatter) ... ok
-test_errors_with_multiple_version_lines (tap.tests.test_loader.TestLoader) ... ok
-test_errors_with_version_not_on_first_line (tap.tests.test_loader.TestLoader) ... ok
-test_file_does_not_exist (tap.tests.test_loader.TestLoader)
-The loader records a failure when a file does not exist. ... ok
-test_handles_directory (tap.tests.test_loader.TestLoader) ... ok
-test_handles_file (tap.tests.test_loader.TestLoader)
-The loader handles a file. ... ok
-test_loads_from_stream (tap.tests.test_loader.TestLoader) ... ok
-test_skip_plan_aborts_loading (tap.tests.test_loader.TestLoader) ... ok
-test_finds_simplest_skip (tap.tests.test_directive.TestDirective) ... ok
-test_finds_simplest_todo (tap.tests.test_directive.TestDirective) ... ok
-test_finds_skip (tap.tests.test_directive.TestDirective) ... ok
-test_finds_todo (tap.tests.test_directive.TestDirective) ... ok
-test_skip_at_beginning (tap.tests.test_directive.TestDirective)
-Only match SKIP directives at the beginning. ... ok
-test_todo_has_boundary (tap.tests.test_directive.TestDirective)
-TAP spec indicates TODO directives must be on a boundary. ... ok
-test_errors_on_bail (tap.tests.test_rules.TestRules) ... ok
-test_errors_plan_not_at_end (tap.tests.test_rules.TestRules) ... ok
-test_errors_when_expected_tests_differs_from_actual (tap.tests.test_rules.TestRules) ... ok
-test_handles_skipping_plan (tap.tests.test_rules.TestRules) ... ok
-test_only_one_plan (tap.tests.test_rules.TestRules) ... ok
-test_plan_line_two (tap.tests.test_rules.TestRules)
-A plan may appear on line 2 when line 1 is a version line. ... ok
-test_requires_plan (tap.tests.test_rules.TestRules) ... ok
-test_tracks_plan_line (tap.tests.test_rules.TestRules) ... ok
-test_adapter_has_filename (tap.tests.test_adapter.TestAdapter)
-The adapter has a TAP filename. ... ok
-test_handles_not_ok_todo_test_line (tap.tests.test_adapter.TestAdapter)
-Add an expected failure for a not ok todo test line. ... ok
-test_handles_ok_test_line (tap.tests.test_adapter.TestAdapter)
-Add a success for an ok test line. ... ok
-test_handles_ok_todo_test_line (tap.tests.test_adapter.TestAdapter)
-Add an unexpected success for an ok todo test line. ... ok
-test_handles_skip_test_line (tap.tests.test_adapter.TestAdapter)
-Add a skip when a test line contains a skip directive. ... ok
-test_line_requires_category (tap.tests.test_line.TestLine) ... ok
-test_category (tap.tests.test_line.TestResult) ... ok
-test_ok (tap.tests.test_line.TestResult) ... ok
-test_str_diagnostics (tap.tests.test_line.TestResult) ... ok
-test_str_directive (tap.tests.test_line.TestResult) ... ok
-test_str_not_ok (tap.tests.test_line.TestResult) ... ok
-test_str_ok (tap.tests.test_line.TestResult) ... ok
 test_add_not_ok_writes_to_stream_while_streaming (tap.tests.test_tracker.TestTracker) ... ok
 test_add_ok_writes_to_stream_while_streaming (tap.tests.test_tracker.TestTracker) ... ok
 test_add_skip_writes_to_stream_while_streaming (tap.tests.test_tracker.TestTracker) ... ok
@@ -1273,23 +1308,22 @@
 test_write_plan_first_not_combined (tap.tests.test_tracker.TestTracker) ... ok
 test_write_plan_first_streaming (tap.tests.test_tracker.TestTracker) ... ok
 test_write_plan_immediate_streaming (tap.tests.test_tracker.TestTracker) ... ok
-test_bad_format_string (tap.tests.test_runner.TestTAPTestRunner)
-A bad format string exits the runner. ... ok
-test_has_tap_test_result (tap.tests.test_runner.TestTAPTestRunner) ... ok
-test_runner_sets_tracker_for_streaming (tap.tests.test_runner.TestTAPTestRunner)
-The tracker is set for streaming mode. ... ok
-test_runner_stream_to_devnull_for_streaming (tap.tests.test_runner.TestTAPTestRunner) ... ok
-test_runner_uses_combined (tap.tests.test_runner.TestTAPTestRunner)
-Test that output is combined. ... ok
-test_runner_uses_format (tap.tests.test_runner.TestTAPTestRunner)
-Test that format is set on TAPTestResult FORMAT. ... ok
-test_runner_uses_header (tap.tests.test_runner.TestTAPTestRunner)
-Test that the case header can be turned off. ... ok
-test_runner_uses_outdir (tap.tests.test_runner.TestTAPTestRunner)
-Test that the test runner sets the outdir so that TAP ... ok
+test_line_requires_category (tap.tests.test_line.TestLine) ... ok
+test_category (tap.tests.test_line.TestResult) ... ok
+test_ok (tap.tests.test_line.TestResult) ... ok
+test_str_diagnostics (tap.tests.test_line.TestResult) ... ok
+test_str_directive (tap.tests.test_line.TestResult) ... ok
+test_str_not_ok (tap.tests.test_line.TestResult) ... ok
+test_str_ok (tap.tests.test_line.TestResult) ... ok
+test_adds_error (tap.tests.test_result.TestTAPTestResult) ... ok
+test_adds_expected_failure (tap.tests.test_result.TestTAPTestResult) ... ok
+test_adds_failure (tap.tests.test_result.TestTAPTestResult) ... ok
+test_adds_skip (tap.tests.test_result.TestTAPTestResult) ... ok
+test_adds_success (tap.tests.test_result.TestTAPTestResult) ... ok
+test_adds_unexpected_success (tap.tests.test_result.TestTAPTestResult) ... ok
 
 ----------------------------------------------------------------------
-Ran 109 tests in 0.095s
+Ran 109 tests in 0.085s
 
 OK
 I: pybuild base:217: python3.7 setup.py test 
@@ -1305,56 +1339,19 @@
 no previously-included directories found matching 'docs/_build'
 writing manifest file 'tap.py.egg-info/SOURCES.txt'
 running build_ext
-test_adds_error (tap.tests.test_result.TestTAPTestResult) ... /usr/lib/python3.7/unittest/case.py:615: ResourceWarning: unclosed file <_io.TextIOWrapper name='/dev/null' mode='w' encoding='UTF-8'>
+test_adapter_has_filename (tap.tests.test_adapter.TestAdapter)
+The adapter has a TAP filename. ... ok
+test_handles_not_ok_todo_test_line (tap.tests.test_adapter.TestAdapter)
+Add an expected failure for a not ok todo test line. ... /usr/lib/python3.7/unittest/case.py:615: ResourceWarning: unclosed file <_io.TextIOWrapper name=3 mode='w' encoding='UTF-8'>
   testMethod()
 ResourceWarning: Enable tracemalloc to get the object allocation traceback
 ok
-test_adds_expected_failure (tap.tests.test_result.TestTAPTestResult) ... ok
-test_adds_failure (tap.tests.test_result.TestTAPTestResult) ... ok
-test_adds_skip (tap.tests.test_result.TestTAPTestResult) ... ok
-test_adds_success (tap.tests.test_result.TestTAPTestResult) ... ok
-test_adds_unexpected_success (tap.tests.test_result.TestTAPTestResult) ... ok
-test_after_hash_is_not_description (tap.tests.test_parser.TestParser) ... ok
-test_bail_out_line (tap.tests.test_parser.TestParser)
-The parser extracts a bail out line. ... ok
-test_diagnostic_line (tap.tests.test_parser.TestParser)
-The parser extracts a diagnostic line. ... ok
-test_errors_on_old_version (tap.tests.test_parser.TestParser)
-The TAP spec dictates that anything less than 13 is an error. ... ok
-test_finds_description (tap.tests.test_parser.TestParser) ... ok
-test_finds_directive (tap.tests.test_parser.TestParser)
-The parser extracts a directive ... ok
-test_finds_not_ok (tap.tests.test_parser.TestParser)
-The parser extracts a not ok line. ... ok
-test_finds_number (tap.tests.test_parser.TestParser)
-The parser extracts a test number. ... ok
-test_finds_ok (tap.tests.test_parser.TestParser)
-The parser extracts an ok line. ... ok
-test_finds_plan (tap.tests.test_parser.TestParser)
-The parser extracts a plan line. ... ok
-test_finds_plan_with_skip (tap.tests.test_parser.TestParser)
-The parser extracts a plan line containing a SKIP. ... ok
-test_finds_skip (tap.tests.test_parser.TestParser) ... ok
-test_finds_todo (tap.tests.test_parser.TestParser) ... ok
-test_finds_version (tap.tests.test_parser.TestParser)
-The parser extracts a version line. ... ok
-test_ignores_plan_with_any_non_skip_directive (tap.tests.test_parser.TestParser)
-The parser only recognizes SKIP directives in plans. ... ok
-test_malformed_yaml (tap.tests.test_parser.TestParser) ... ok
-test_parse_empty_file (tap.tests.test_parser.TestParser) ... ok
-test_parses_file (tap.tests.test_parser.TestParser) ... ok
-test_parses_stdin (tap.tests.test_parser.TestParser) ... ok
-test_parses_text (tap.tests.test_parser.TestParser) ... ok
-test_parses_yaml (tap.tests.test_parser.TestParser) ... ok
-test_parses_yaml_more_complex (tap.tests.test_parser.TestParser) ... /usr/lib/python3/dist-packages/yaml/scanner.py:283: ResourceWarning: unclosed file <_io.FileIO name='/dev/null' mode='wb' closefd=True>
-  for level in list(self.possible_simple_keys):
-ResourceWarning: Enable tracemalloc to get the object allocation traceback
-ok
-test_parses_yaml_no_association (tap.tests.test_parser.TestParser) ... ok
-test_parses_yaml_no_end (tap.tests.test_parser.TestParser) ... ok
-test_parses_yaml_no_start (tap.tests.test_parser.TestParser) ... ok
-test_unrecognizable_line (tap.tests.test_parser.TestParser)
-The parser returns an unrecognizable line. ... ok
+test_handles_ok_test_line (tap.tests.test_adapter.TestAdapter)
+Add a success for an ok test line. ... ok
+test_handles_ok_todo_test_line (tap.tests.test_adapter.TestAdapter)
+Add an unexpected success for an ok todo test line. ... ok
+test_handles_skip_test_line (tap.tests.test_adapter.TestAdapter)
+Add a skip when a test line contains a skip directive. ... ok
 test_build_suite_from_stdin (tap.tests.test_main.TestMain) ... ok
 test_build_suite_from_stdin_dash (tap.tests.test_main.TestMain) ... ok
 test_exits_with_error (tap.tests.test_main.TestMain)
@@ -1375,6 +1372,20 @@
 The loader handles a file. ... ok
 test_loads_from_stream (tap.tests.test_loader.TestLoader) ... ok
 test_skip_plan_aborts_loading (tap.tests.test_loader.TestLoader) ... ok
+test_bad_format_string (tap.tests.test_runner.TestTAPTestRunner)
+A bad format string exits the runner. ... ok
+test_has_tap_test_result (tap.tests.test_runner.TestTAPTestRunner) ... ok
+test_runner_sets_tracker_for_streaming (tap.tests.test_runner.TestTAPTestRunner)
+The tracker is set for streaming mode. ... ok
+test_runner_stream_to_devnull_for_streaming (tap.tests.test_runner.TestTAPTestRunner) ... ok
+test_runner_uses_combined (tap.tests.test_runner.TestTAPTestRunner)
+Test that output is combined. ... ok
+test_runner_uses_format (tap.tests.test_runner.TestTAPTestRunner)
+Test that format is set on TAPTestResult FORMAT. ... ok
+test_runner_uses_header (tap.tests.test_runner.TestTAPTestRunner)
+Test that the case header can be turned off. ... ok
+test_runner_uses_outdir (tap.tests.test_runner.TestTAPTestRunner)
+Test that the test runner sets the outdir so that TAP ... ok
 test_finds_simplest_skip (tap.tests.test_directive.TestDirective) ... ok
 test_finds_simplest_todo (tap.tests.test_directive.TestDirective) ... ok
 test_finds_skip (tap.tests.test_directive.TestDirective) ... ok
@@ -1392,26 +1403,44 @@
 A plan may appear on line 2 when line 1 is a version line. ... ok
 test_requires_plan (tap.tests.test_rules.TestRules) ... ok
 test_tracks_plan_line (tap.tests.test_rules.TestRules) ... ok
-test_adapter_has_filename (tap.tests.test_adapter.TestAdapter)
-The adapter has a TAP filename. ... ok
-test_handles_not_ok_todo_test_line (tap.tests.test_adapter.TestAdapter)
-Add an expected failure for a not ok todo test line. ... /usr/lib/python3.7/unittest/case.py:615: ResourceWarning: unclosed file <_io.TextIOWrapper name=3 mode='w' encoding='UTF-8'>
-  testMethod()
-ResourceWarning: Enable tracemalloc to get the object allocation traceback
-ok
-test_handles_ok_test_line (tap.tests.test_adapter.TestAdapter)
-Add a success for an ok test line. ... ok
-test_handles_ok_todo_test_line (tap.tests.test_adapter.TestAdapter)
-Add an unexpected success for an ok todo test line. ... ok
-test_handles_skip_test_line (tap.tests.test_adapter.TestAdapter)
-Add a skip when a test line contains a skip directive. ... ok
-test_line_requires_category (tap.tests.test_line.TestLine) ... ok
-test_category (tap.tests.test_line.TestResult) ... ok
-test_ok (tap.tests.test_line.TestResult) ... ok
-test_str_diagnostics (tap.tests.test_line.TestResult) ... ok
-test_str_directive (tap.tests.test_line.TestResult) ... ok
-test_str_not_ok (tap.tests.test_line.TestResult) ... ok
-test_str_ok (tap.tests.test_line.TestResult) ... ok
+test_after_hash_is_not_description (tap.tests.test_parser.TestParser) ... ok
+test_bail_out_line (tap.tests.test_parser.TestParser)
+The parser extracts a bail out line. ... ok
+test_diagnostic_line (tap.tests.test_parser.TestParser)
+The parser extracts a diagnostic line. ... ok
+test_errors_on_old_version (tap.tests.test_parser.TestParser)
+The TAP spec dictates that anything less than 13 is an error. ... ok
+test_finds_description (tap.tests.test_parser.TestParser) ... ok
+test_finds_directive (tap.tests.test_parser.TestParser)
+The parser extracts a directive ... ok
+test_finds_not_ok (tap.tests.test_parser.TestParser)
+The parser extracts a not ok line. ... ok
+test_finds_number (tap.tests.test_parser.TestParser)
+The parser extracts a test number. ... ok
+test_finds_ok (tap.tests.test_parser.TestParser)
+The parser extracts an ok line. ... ok
+test_finds_plan (tap.tests.test_parser.TestParser)
+The parser extracts a plan line. ... ok
+test_finds_plan_with_skip (tap.tests.test_parser.TestParser)
+The parser extracts a plan line containing a SKIP. ... ok
+test_finds_skip (tap.tests.test_parser.TestParser) ... ok
+test_finds_todo (tap.tests.test_parser.TestParser) ... ok
+test_finds_version (tap.tests.test_parser.TestParser)
+The parser extracts a version line. ... ok
+test_ignores_plan_with_any_non_skip_directive (tap.tests.test_parser.TestParser)
+The parser only recognizes SKIP directives in plans. ... ok
+test_malformed_yaml (tap.tests.test_parser.TestParser) ... ok
+test_parse_empty_file (tap.tests.test_parser.TestParser) ... ok
+test_parses_file (tap.tests.test_parser.TestParser) ... ok
+test_parses_stdin (tap.tests.test_parser.TestParser) ... ok
+test_parses_text (tap.tests.test_parser.TestParser) ... ok
+test_parses_yaml (tap.tests.test_parser.TestParser) ... ok
+test_parses_yaml_more_complex (tap.tests.test_parser.TestParser) ... ok
+test_parses_yaml_no_association (tap.tests.test_parser.TestParser) ... ok
+test_parses_yaml_no_end (tap.tests.test_parser.TestParser) ... ok
+test_parses_yaml_no_start (tap.tests.test_parser.TestParser) ... ok
+test_unrecognizable_line (tap.tests.test_parser.TestParser)
+The parser returns an unrecognizable line. ... ok
 test_add_not_ok_writes_to_stream_while_streaming (tap.tests.test_tracker.TestTracker) ... ok
 test_add_ok_writes_to_stream_while_streaming (tap.tests.test_tracker.TestTracker) ... ok
 test_add_skip_writes_to_stream_while_streaming (tap.tests.test_tracker.TestTracker) ... ok
@@ -1441,23 +1470,22 @@
 test_write_plan_first_not_combined (tap.tests.test_tracker.TestTracker) ... ok
 test_write_plan_first_streaming (tap.tests.test_tracker.TestTracker) ... ok
 test_write_plan_immediate_streaming (tap.tests.test_tracker.TestTracker) ... ok
-test_bad_format_string (tap.tests.test_runner.TestTAPTestRunner)
-A bad format string exits the runner. ... ok
-test_has_tap_test_result (tap.tests.test_runner.TestTAPTestRunner) ... ok
-test_runner_sets_tracker_for_streaming (tap.tests.test_runner.TestTAPTestRunner)
-The tracker is set for streaming mode. ... ok
-test_runner_stream_to_devnull_for_streaming (tap.tests.test_runner.TestTAPTestRunner) ... ok
-test_runner_uses_combined (tap.tests.test_runner.TestTAPTestRunner)
-Test that output is combined. ... ok
-test_runner_uses_format (tap.tests.test_runner.TestTAPTestRunner)
-Test that format is set on TAPTestResult FORMAT. ... ok
-test_runner_uses_header (tap.tests.test_runner.TestTAPTestRunner)
-Test that the case header can be turned off. ... ok
-test_runner_uses_outdir (tap.tests.test_runner.TestTAPTestRunner)
-Test that the test runner sets the outdir so that TAP ... ok
+test_line_requires_category (tap.tests.test_line.TestLine) ... ok
+test_category (tap.tests.test_line.TestResult) ... ok
+test_ok (tap.tests.test_line.TestResult) ... ok
+test_str_diagnostics (tap.tests.test_line.TestResult) ... ok
+test_str_directive (tap.tests.test_line.TestResult) ... ok
+test_str_not_ok (tap.tests.test_line.TestResult) ... ok
+test_str_ok (tap.tests.test_line.TestResult) ... ok
+test_adds_error (tap.tests.test_result.TestTAPTestResult) ... ok
+test_adds_expected_failure (tap.tests.test_result.TestTAPTestResult) ... ok
+test_adds_failure (tap.tests.test_result.TestTAPTestResult) ... ok
+test_adds_skip (tap.tests.test_result.TestTAPTestResult) ... ok
+test_adds_success (tap.tests.test_result.TestTAPTestResult) ... ok
+test_adds_unexpected_success (tap.tests.test_result.TestTAPTestResult) ... ok
 
 ----------------------------------------------------------------------
-Ran 109 tests in 0.099s
+Ran 109 tests in 0.093s
 
 OK
 make[1]: Leaving directory '/build/tap.py-2.5'
@@ -1470,16 +1498,16 @@
 running build
 running build_py
 running compile_catalog
-compiling catalog tap/locale/ja/LC_MESSAGES/tappy.po to tap/locale/ja/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/zh/LC_MESSAGES/tappy.po to tap/locale/zh/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/ru/LC_MESSAGES/tappy.po to tap/locale/ru/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/it/LC_MESSAGES/tappy.po to tap/locale/it/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/ar/LC_MESSAGES/tappy.po to tap/locale/ar/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/nl/LC_MESSAGES/tappy.po to tap/locale/nl/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/fr/LC_MESSAGES/tappy.po to tap/locale/fr/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/ar/LC_MESSAGES/tappy.po to tap/locale/ar/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/pt/LC_MESSAGES/tappy.po to tap/locale/pt/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/de/LC_MESSAGES/tappy.po to tap/locale/de/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/nl/LC_MESSAGES/tappy.po to tap/locale/nl/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/es/LC_MESSAGES/tappy.po to tap/locale/es/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/ja/LC_MESSAGES/tappy.po to tap/locale/ja/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/ru/LC_MESSAGES/tappy.po to tap/locale/ru/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/zh/LC_MESSAGES/tappy.po to tap/locale/zh/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/it/LC_MESSAGES/tappy.po to tap/locale/it/LC_MESSAGES/tappy.mo
 running egg_info
 writing requirements to tap.py.egg-info/requires.txt
 writing tap.py.egg-info/PKG-INFO
@@ -1507,58 +1535,42 @@
 creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7
 creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages
 creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/i18n.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/runner.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/adapter.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/parser.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/formatter.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/line.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/__init__.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/main.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/rules.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tracker.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/main.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/i18n.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
 creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_result.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_parser.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/run.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_adapter.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_main.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_formatter.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_loader.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/__init__.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/factory.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_directive.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/testcase.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/__init__.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_runner.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_directive.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_rules.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_adapter.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_line.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_parser.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_tracker.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_runner.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/line.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/directive.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/run.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_line.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/tests/test_result.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests
 creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale
-creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ja
-creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ja/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/ja/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ja/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/ja/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ja/LC_MESSAGES
-creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/zh
-creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/zh/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/zh/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/zh/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/zh/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/zh/LC_MESSAGES
-creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ru
-creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ru/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/ru/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ru/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/ru/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ru/LC_MESSAGES
-creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/it
-creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/it/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/it/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/it/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/it/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/it/LC_MESSAGES
-creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ar
-creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ar/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/ar/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ar/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/ar/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ar/LC_MESSAGES
+creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/nl
+creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/nl/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/nl/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/nl/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/nl/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/nl/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/tappy.pot -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale
 creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/fr
 creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/fr/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/fr/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/fr/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/fr/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/fr/LC_MESSAGES
+creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ar
+creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ar/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/ar/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ar/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/ar/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ar/LC_MESSAGES
 creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/pt
 creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/pt/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/pt/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/pt/LC_MESSAGES
@@ -1567,43 +1579,59 @@
 creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/de/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/de/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/de/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/de/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/de/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/tappy.pot -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale
-creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/nl
-creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/nl/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/nl/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/nl/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/nl/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/nl/LC_MESSAGES
 creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/es
 creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/es/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/es/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/es/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/es/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/es/LC_MESSAGES
+creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ja
+creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ja/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/ja/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ja/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/ja/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ja/LC_MESSAGES
+creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ru
+creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ru/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/ru/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ru/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/ru/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ru/LC_MESSAGES
+creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/zh
+creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/zh/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/zh/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/zh/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/zh/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/zh/LC_MESSAGES
+creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/it
+creating /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/it/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/it/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/it/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/locale/it/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/it/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/parser.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/directive.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
 copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/loader.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/i18n.py to i18n.pyc
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/formatter.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/rules.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython2_2.7_tap/build/tap/adapter.py -> /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap
 byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/runner.py to runner.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/adapter.py to adapter.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/parser.py to parser.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/formatter.py to formatter.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/line.py to line.pyc
 byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/__init__.py to __init__.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/main.py to main.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/rules.py to rules.pyc
 byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tracker.py to tracker.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_result.py to test_result.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_parser.py to test_parser.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/run.py to run.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/main.py to main.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/i18n.py to i18n.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_adapter.py to test_adapter.pyc
 byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_main.py to test_main.pyc
 byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_formatter.py to test_formatter.pyc
 byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_loader.py to test_loader.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/__init__.py to __init__.pyc
 byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/factory.py to factory.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_directive.py to test_directive.pyc
 byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/testcase.py to testcase.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/__init__.py to __init__.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_runner.py to test_runner.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_directive.py to test_directive.pyc
 byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_rules.py to test_rules.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_adapter.py to test_adapter.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_line.py to test_line.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_parser.py to test_parser.pyc
 byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_tracker.py to test_tracker.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_runner.py to test_runner.pyc
-byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/line.py to line.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/run.py to run.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_line.py to test_line.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/tests/test_result.py to test_result.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/parser.py to parser.pyc
 byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/directive.py to directive.pyc
 byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/loader.py to loader.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/formatter.py to formatter.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/rules.py to rules.pyc
+byte-compiling /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap/adapter.py to adapter.pyc
 running install_egg_info
 Copying tap.py.egg-info to /build/tap.py-2.5/debian/python-tap/usr/lib/python2.7/dist-packages/tap.py-2.5.egg-info
 Skipping SOURCES.txt
@@ -1615,16 +1643,16 @@
 running build
 running build_py
 running compile_catalog
-compiling catalog tap/locale/ja/LC_MESSAGES/tappy.po to tap/locale/ja/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/zh/LC_MESSAGES/tappy.po to tap/locale/zh/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/ru/LC_MESSAGES/tappy.po to tap/locale/ru/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/it/LC_MESSAGES/tappy.po to tap/locale/it/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/ar/LC_MESSAGES/tappy.po to tap/locale/ar/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/nl/LC_MESSAGES/tappy.po to tap/locale/nl/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/fr/LC_MESSAGES/tappy.po to tap/locale/fr/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/ar/LC_MESSAGES/tappy.po to tap/locale/ar/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/pt/LC_MESSAGES/tappy.po to tap/locale/pt/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/de/LC_MESSAGES/tappy.po to tap/locale/de/LC_MESSAGES/tappy.mo
-compiling catalog tap/locale/nl/LC_MESSAGES/tappy.po to tap/locale/nl/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/es/LC_MESSAGES/tappy.po to tap/locale/es/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/ja/LC_MESSAGES/tappy.po to tap/locale/ja/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/ru/LC_MESSAGES/tappy.po to tap/locale/ru/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/zh/LC_MESSAGES/tappy.po to tap/locale/zh/LC_MESSAGES/tappy.mo
+compiling catalog tap/locale/it/LC_MESSAGES/tappy.po to tap/locale/it/LC_MESSAGES/tappy.mo
 running egg_info
 writing tap.py.egg-info/PKG-INFO
 writing dependency_links to tap.py.egg-info/dependency_links.txt
@@ -1652,58 +1680,42 @@
 creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7
 creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages
 creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/i18n.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/runner.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/adapter.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/parser.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/formatter.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/line.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/__init__.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/main.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/rules.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tracker.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/main.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/i18n.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
 creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_result.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_parser.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/run.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_adapter.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_main.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_formatter.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_loader.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/__init__.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/factory.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_directive.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/testcase.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/__init__.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_runner.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_directive.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_rules.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_adapter.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_line.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_parser.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_tracker.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_runner.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/line.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/directive.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/run.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_line.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/tests/test_result.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests
 creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale
-creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ja
-creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ja/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/ja/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ja/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/ja/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ja/LC_MESSAGES
-creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/zh
-creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/zh/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/zh/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/zh/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/zh/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/zh/LC_MESSAGES
-creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ru
-creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ru/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/ru/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ru/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/ru/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ru/LC_MESSAGES
-creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/it
-creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/it/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/it/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/it/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/it/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/it/LC_MESSAGES
-creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ar
-creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ar/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/ar/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ar/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/ar/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ar/LC_MESSAGES
+creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/nl
+creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/nl/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/nl/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/nl/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/nl/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/nl/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/tappy.pot -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale
 creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/fr
 creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/fr/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/fr/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/fr/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/fr/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/fr/LC_MESSAGES
+creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ar
+creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ar/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/ar/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ar/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/ar/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ar/LC_MESSAGES
 creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/pt
 creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/pt/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/pt/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/pt/LC_MESSAGES
@@ -1712,43 +1724,59 @@
 creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/de/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/de/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/de/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/de/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/de/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/tappy.pot -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale
-creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/nl
-creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/nl/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/nl/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/nl/LC_MESSAGES
-copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/nl/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/nl/LC_MESSAGES
 creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/es
 creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/es/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/es/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/es/LC_MESSAGES
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/es/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/es/LC_MESSAGES
+creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ja
+creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ja/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/ja/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ja/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/ja/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ja/LC_MESSAGES
+creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ru
+creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ru/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/ru/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ru/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/ru/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/ru/LC_MESSAGES
+creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/zh
+creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/zh/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/zh/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/zh/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/zh/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/zh/LC_MESSAGES
+creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/it
+creating /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/it/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/it/LC_MESSAGES/tappy.po -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/it/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/locale/it/LC_MESSAGES/tappy.mo -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/locale/it/LC_MESSAGES
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/parser.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/directive.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
 copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/loader.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/i18n.py to i18n.cpython-37.pyc
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/formatter.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/rules.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
+copying /build/tap.py-2.5/.pybuild/cpython3_3.7_tap/build/tap/adapter.py -> /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap
 byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/runner.py to runner.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/adapter.py to adapter.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/parser.py to parser.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/formatter.py to formatter.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/line.py to line.cpython-37.pyc
 byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/__init__.py to __init__.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/main.py to main.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/rules.py to rules.cpython-37.pyc
 byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tracker.py to tracker.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_result.py to test_result.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_parser.py to test_parser.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/run.py to run.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/main.py to main.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/i18n.py to i18n.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_adapter.py to test_adapter.cpython-37.pyc
 byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_main.py to test_main.cpython-37.pyc
 byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_formatter.py to test_formatter.cpython-37.pyc
 byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_loader.py to test_loader.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/__init__.py to __init__.cpython-37.pyc
 byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/factory.py to factory.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_directive.py to test_directive.cpython-37.pyc
 byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/testcase.py to testcase.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/__init__.py to __init__.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_runner.py to test_runner.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_directive.py to test_directive.cpython-37.pyc
 byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_rules.py to test_rules.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_adapter.py to test_adapter.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_line.py to test_line.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_parser.py to test_parser.cpython-37.pyc
 byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_tracker.py to test_tracker.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_runner.py to test_runner.cpython-37.pyc
-byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/line.py to line.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/run.py to run.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_line.py to test_line.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/tests/test_result.py to test_result.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/parser.py to parser.cpython-37.pyc
 byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/directive.py to directive.cpython-37.pyc
 byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/loader.py to loader.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/formatter.py to formatter.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/rules.py to rules.cpython-37.pyc
+byte-compiling /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap/adapter.py to adapter.cpython-37.pyc
 running install_egg_info
 Copying tap.py.egg-info to /build/tap.py-2.5/debian/python3-tap/usr/lib/python3.7/dist-packages/tap.py-2.5.egg-info
 Skipping SOURCES.txt
@@ -1778,39 +1806,39 @@
    dh_perl -O--buildsystem=pybuild
    dh_link -O--buildsystem=pybuild
    dh_strip_nondeterminism -O--buildsystem=pybuild
-	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ar/LC_MESSAGES/tappy.mo
+	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/nl/LC_MESSAGES/tappy.mo
 	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/fr/LC_MESSAGES/tappy.mo
-	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/pt/LC_MESSAGES/tappy.mo
-	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/de/LC_MESSAGES/tappy.mo
+	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ar/LC_MESSAGES/tappy.mo
 	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ja/LC_MESSAGES/tappy.mo
-	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/zh/LC_MESSAGES/tappy.mo
 	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/ru/LC_MESSAGES/tappy.mo
-	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/it/LC_MESSAGES/tappy.mo
-	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/nl/LC_MESSAGES/tappy.mo
+	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/zh/LC_MESSAGES/tappy.mo
+	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/pt/LC_MESSAGES/tappy.mo
+	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/de/LC_MESSAGES/tappy.mo
 	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/es/LC_MESSAGES/tappy.mo
-	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/ar/LC_MESSAGES/tappy.mo
+	Normalized debian/python-tap/usr/lib/python2.7/dist-packages/tap/locale/it/LC_MESSAGES/tappy.mo
+	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/nl/LC_MESSAGES/tappy.mo
 	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/fr/LC_MESSAGES/tappy.mo
-	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/pt/LC_MESSAGES/tappy.mo
-	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/de/LC_MESSAGES/tappy.mo
+	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/ar/LC_MESSAGES/tappy.mo
 	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/ja/LC_MESSAGES/tappy.mo
-	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/zh/LC_MESSAGES/tappy.mo
 	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/ru/LC_MESSAGES/tappy.mo
-	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/it/LC_MESSAGES/tappy.mo
-	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/nl/LC_MESSAGES/tappy.mo
+	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/zh/LC_MESSAGES/tappy.mo
+	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/pt/LC_MESSAGES/tappy.mo
+	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/de/LC_MESSAGES/tappy.mo
 	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/es/LC_MESSAGES/tappy.mo
+	Normalized debian/python3-tap/usr/lib/python3/dist-packages/tap/locale/it/LC_MESSAGES/tappy.mo
    dh_compress -O--buildsystem=pybuild
    dh_fixperms -O--buildsystem=pybuild
    dh_missing -O--buildsystem=pybuild
    dh_installdeb -O--buildsystem=pybuild
    dh_gencontrol -O--buildsystem=pybuild
+dpkg-gencontrol: warning: package python-tap-doc: substitution variable ${sphinxdoc:Built-Using} unused, but is defined
 dpkg-gencontrol: warning: package python-tap: substitution variable ${python:Provides} unused, but is defined
 dpkg-gencontrol: warning: package python-tap: substitution variable ${python:Versions} unused, but is defined
-dpkg-gencontrol: warning: package python-tap-doc: substitution variable ${sphinxdoc:Built-Using} unused, but is defined
    dh_md5sums -O--buildsystem=pybuild
    dh_builddeb -O--buildsystem=pybuild
 dpkg-deb: building package 'python-tap' in '../python-tap_2.5-2_all.deb'.
-dpkg-deb: building package 'python3-tap' in '../python3-tap_2.5-2_all.deb'.
 dpkg-deb: building package 'python-tap-doc' in '../python-tap-doc_2.5-2_all.deb'.
+dpkg-deb: building package 'python3-tap' in '../python3-tap_2.5-2_all.deb'.
 dpkg-deb: building package 'tappy' in '../tappy_2.5-2_all.deb'.
  dpkg-genbuildinfo --build=binary
  dpkg-genchanges --build=binary >../tap.py_2.5-2_armhf.changes
@@ -1819,12 +1847,14 @@
 dpkg-source: info: using options from tap.py-2.5/debian/source/options: --extend-diff-ignore=^([^/]*[.]egg-info/|tap/locale/[^/]+/LC_MESSAGES/[^/]+.mo)
 dpkg-buildpackage: info: binary-only upload (no source included)
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/22973/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/22973/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/23675 and its subdirectories
-I: Current time: Wed Oct 28 11:47:49 -12 2020
-I: pbuilder-time-stamp: 1603928869
+I: removing directory /srv/workspace/pbuilder/22973 and its subdirectories
+I: Current time: Thu Oct 29 13:51:28 +14 2020
+I: pbuilder-time-stamp: 1603929088