<86>Feb 12 10:39:01 userdel[3973809]: delete user 'rooter'
<86>Feb 12 10:39:01 userdel[3973809]: removed group 'rooter' owned by 'rooter'
<86>Feb 12 10:39:01 userdel[3973809]: removed shadow group 'rooter' owned by 'rooter'
<86>Feb 12 10:39:01 groupadd[3973814]: group added to /etc/group: name=rooter, GID=531
<86>Feb 12 10:39:01 groupadd[3973814]: group added to /etc/gshadow: name=rooter
<86>Feb 12 10:39:01 groupadd[3973814]: new group: name=rooter, GID=531
<86>Feb 12 10:39:01 useradd[3973818]: new user: name=rooter, UID=531, GID=531, home=/root, shell=/bin/bash
<86>Feb 12 10:39:01 userdel[3973825]: delete user 'builder'
<86>Feb 12 10:39:01 userdel[3973825]: removed group 'builder' owned by 'builder'
<86>Feb 12 10:39:01 userdel[3973825]: removed shadow group 'builder' owned by 'builder'
<86>Feb 12 10:39:01 groupadd[3973830]: group added to /etc/group: name=builder, GID=532
<86>Feb 12 10:39:01 groupadd[3973830]: group added to /etc/gshadow: name=builder
<86>Feb 12 10:39:01 groupadd[3973830]: new group: name=builder, GID=532
<86>Feb 12 10:39:01 useradd[3973834]: new user: name=builder, UID=532, GID=532, home=/usr/src, shell=/bin/bash
<13>Feb 12 10:39:05 rpmi: libgdbm-1.8.3-alt10 1454943334 installed
<13>Feb 12 10:39:05 rpmi: libexpat-2.2.4-alt1 1503305345 installed
<13>Feb 12 10:39:05 rpmi: libp11-kit-0.23.15-alt1 sisyphus+226408.100.2.1 1554288204 installed
<13>Feb 12 10:39:05 rpmi: libtasn1-4.16.0-alt1 sisyphus+245480.100.1.1 1580825062 installed
<13>Feb 12 10:39:05 rpmi: rpm-macros-alternatives-0.5.1-alt1 sisyphus+226946.100.1.1 1554830426 installed
<13>Feb 12 10:39:05 rpmi: alternatives-0.5.1-alt1 sisyphus+226946.100.1.1 1554830426 installed
<13>Feb 12 10:39:05 rpmi: ca-certificates-2020.01.23-alt1 sisyphus+244791.300.2.1 1580285500 installed
<13>Feb 12 10:39:05 rpmi: ca-trust-0.1.2-alt1 sisyphus+233348.100.1.1 1561653823 installed
<13>Feb 12 10:39:05 rpmi: p11-kit-trust-0.23.15-alt1 sisyphus+226408.100.2.1 1554288204 installed
<13>Feb 12 10:39:05 rpmi: libcrypto1.1-1.1.1d-alt1.1 sisyphus+237931.100.2.1 1569235729 installed
<13>Feb 12 10:39:05 rpmi: libssl1.1-1.1.1d-alt1.1 sisyphus+237931.100.2.1 1569235729 installed
<13>Feb 12 10:39:05 rpmi: python3-3.7.4-alt2 sisyphus+239418.100.1.1 1571389913 installed
<13>Feb 12 10:39:05 rpmi: libpython3-3.7.4-alt2 sisyphus+239418.100.1.1 1571389913 installed
<13>Feb 12 10:39:07 rpmi: python3-base-3.7.4-alt2 sisyphus+239418.100.1.1 1571389913 installed
<13>Feb 12 10:39:07 rpmi: tests-for-installed-python3-pkgs-0.1.13.1-alt2 1535450458 installed
<13>Feb 12 10:39:07 rpmi: rpm-build-python3-0.1.13.1-alt2 1535450458 installed
<13>Feb 12 10:39:10 rpmi: libverto-0.3.0-alt1_7 sisyphus+225932.100.1.1 1553994919 installed
<13>Feb 12 10:39:10 rpmi: libkeyutils-1.6-alt2 sisyphus+226520.100.2.1 1554512089 installed
<13>Feb 12 10:39:10 rpmi: libcom_err-1.44.6-alt1 sisyphus+224154.100.1.1 1552091678 installed
<86>Feb 12 10:39:10 groupadd[3977771]: group added to /etc/group: name=_keytab, GID=499
<86>Feb 12 10:39:10 groupadd[3977771]: group added to /etc/gshadow: name=_keytab
<86>Feb 12 10:39:10 groupadd[3977771]: new group: name=_keytab, GID=499
<13>Feb 12 10:39:10 rpmi: libkrb5-1.17.1-alt1 sisyphus+242784.100.1.1 1576137330 installed
<13>Feb 12 10:39:10 rpmi: libtirpc-1.0.3-alt1 1532008017 installed
<13>Feb 12 10:39:10 rpmi: libnsl2-1.1.0-alt1_1 1511548749 installed
<13>Feb 12 10:39:10 rpmi: python-modules-encodings-2.7.17-alt4 sisyphus+244873.100.2.1 1581419544 installed
<13>Feb 12 10:39:11 rpmi: python-modules-compiler-2.7.17-alt4 sisyphus+244873.100.2.1 1581419544 installed
<13>Feb 12 10:39:11 rpmi: python-modules-email-2.7.17-alt4 sisyphus+244873.100.2.1 1581419544 installed
<13>Feb 12 10:39:11 rpmi: python-modules-unittest-2.7.17-alt4 sisyphus+244873.100.2.1 1581419544 installed
<13>Feb 12 10:39:11 rpmi: python-modules-2.7.17-alt4 sisyphus+244873.100.2.1 1581419544 installed
<13>Feb 12 10:39:11 rpmi: python-modules-nis-2.7.17-alt4 sisyphus+244873.100.2.1 1581419544 installed
<13>Feb 12 10:39:11 rpmi: python-modules-ctypes-2.7.17-alt4 sisyphus+244873.100.2.1 1581419544 installed
<13>Feb 12 10:39:11 rpmi: python-modules-multiprocessing-2.7.17-alt4 sisyphus+244873.100.2.1 1581419544 installed
<13>Feb 12 10:39:11 rpmi: python-modules-logging-2.7.17-alt4 sisyphus+244873.100.2.1 1581419544 installed
<13>Feb 12 10:39:11 rpmi: python-tools-2to3-2.7.17-alt4 sisyphus+244873.100.2.1 1581419544 installed
Building target platforms: i586
Building for target i586
Wrote: /usr/src/in/nosrpm/python3-module-tgt-1.4.3-alt2.nosrc.rpm
<13>Feb 12 10:39:14 rpmi: python3-module-pkg_resources-1:41.4.0-alt1 sisyphus+238787.100.2.1 1570608044 installed
<13>Feb 12 10:39:14 rpmi: libtinfo-devel-6.1.20180407-alt2 sisyphus+222164.200.1.1 1550686226 installed
<13>Feb 12 10:39:14 rpmi: libncurses-devel-6.1.20180407-alt2 sisyphus+222164.200.1.1 1550686226 installed
<13>Feb 12 10:39:14 rpmi: python3-dev-3.7.4-alt2 sisyphus+239418.100.1.1 1571389913 installed
<13>Feb 12 10:39:14 rpmi: python3-module-setuptools-1:41.4.0-alt1 sisyphus+238787.100.2.1 1570608044 installed
Installing python3-module-tgt-1.4.3-alt2.src.rpm
Building target platforms: i586
Building for target i586
Executing(%prep): /bin/sh -e /usr/src/tmp/rpm-tmp.92106
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ rm -rf tgt-1.4.3
+ echo 'Source #0 (tgt-1.4.3.tar.gz):'
Source #0 (tgt-1.4.3.tar.gz):
+ /bin/gzip -dc /usr/src/RPM/SOURCES/tgt-1.4.3.tar.gz
+ /bin/tar -xf -
+ cd tgt-1.4.3
+ /bin/chmod -c -Rf u+rwX,go-w .
+ find -type f -name '*.py' -exec 2to3 -w -n '{}' +
RefactoringTool: Skipping optional fixer: buffer
RefactoringTool: Skipping optional fixer: idioms
RefactoringTool: Skipping optional fixer: set_literal
RefactoringTool: Skipping optional fixer: ws_comma
RefactoringTool: Refactored ./tgt/util.py
RefactoringTool: Refactored ./tgt/io3.py
--- ./tgt/util.py (original)
+++ ./tgt/util.py (refactored)
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import division
+
import re
import collections
@@ -165,7 +165,7 @@
tier1=ccd_tiers[tier.name],
tier2=tier,
offset=0 if use_absolute_time else offset)
- offset = max([tier.end_time for tier in ccd_tiers.values()])
+ offset = max([tier.end_time for tier in list(ccd_tiers.values())])
result_tg = TextGrid()
result_tg.add_tiers([ccd_tiers[x] for x in common_tiers]) #preserve order
return result_tg
--- ./tgt/io3.py (original)
+++ ./tgt/io3.py (refactored)
@@ -238,10 +238,10 @@
'"' + escape_text(tier.name) + '"',
str(tier.start_time), str(tier.end_time), str(len(tier))]
if isinstance(tier, IntervalTier):
- result += [u'{0}\n{1}\n"{2}"'.format(obj.start_time, obj.end_time, escape_text(obj.text))
+ result += ['{0}\n{1}\n"{2}"'.format(obj.start_time, obj.end_time, escape_text(obj.text))
for obj in tier]
elif isinstance(tier, PointTier):
- result += [u'{0}\n"{1}"'.format(obj.time, escape_text(obj.text))
+ result += ['{0}\n"{1}"'.format(obj.time, escape_text(obj.text))
for obj in tier]
else:
raise Exception('Unknown tier type: {0}'.format(tier.name))
@@ -298,50 +298,50 @@
# Create ELAN header
head = [
- u'<?xml version="1.0" encoding="{0}"?>'.format(encoding.upper()),
- u'<ANNOTATION_DOCUMENT AUTHOR="TextGridTools" DATE="{0}" FORMAT="2.7" VERSION="2.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.mpi.nl/tools/elan/EAFv2.7.xsd">'.format(datetime.datetime.now().strftime('%Y-%m-%dT%H:%M:%S+00:00')),
- u'<HEADER MEDIA_FILE="" TIME_UNITS="milliseconds">',
- u'\t<PROPERTY NAME="lastUsedAnnotationId">0</PROPERTY>',
- u'</HEADER>']
+ '<?xml version="1.0" encoding="{0}"?>'.format(encoding.upper()),
+ '<ANNOTATION_DOCUMENT AUTHOR="TextGridTools" DATE="{0}" FORMAT="2.7" VERSION="2.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.mpi.nl/tools/elan/EAFv2.7.xsd">'.format(datetime.datetime.now().strftime('%Y-%m-%dT%H:%M:%S+00:00')),
+ '<HEADER MEDIA_FILE="" TIME_UNITS="milliseconds">',
+ '\t<PROPERTY NAME="lastUsedAnnotationId">0</PROPERTY>',
+ '</HEADER>']
# Create annotations
annotation_id_count = 1
annotations = []
textgrid_copy = correct_start_end_times_and_fill_gaps(textgrid) if include_empty_intervals else textgrid
for tier in textgrid_copy:
- annotations.append(u'<TIER DEFAULT_LOCALE="en" LINGUISTIC_TYPE_REF="default-lt" TIER_ID="{0}">'.format(tier.name))
+ annotations.append('<TIER DEFAULT_LOCALE="en" LINGUISTIC_TYPE_REF="default-lt" TIER_ID="{0}">'.format(tier.name))
if isinstance(tier, IntervalTier):
for interval in tier:
if not include_empty_intervals and interval.text == '':
continue
annotations += [
- u'<ANNOTATION>',
- u'\t<ALIGNABLE_ANNOTATION ANNOTATION_ID="{0}" TIME_SLOT_REF1="{1}" TIME_SLOT_REF2="{2}">'.format('a' + str(annotation_id_count), get_time_slot_id(interval.start_time), get_time_slot_id(interval.end_time)),
- u'\t\t<ANNOTATION_VALUE>{0}</ANNOTATION_VALUE>'.format(interval.text),
- u'\t</ALIGNABLE_ANNOTATION>',
- u'</ANNOTATION>']
+ '<ANNOTATION>',
+ '\t<ALIGNABLE_ANNOTATION ANNOTATION_ID="{0}" TIME_SLOT_REF1="{1}" TIME_SLOT_REF2="{2}">'.format('a' + str(annotation_id_count), get_time_slot_id(interval.start_time), get_time_slot_id(interval.end_time)),
+ '\t\t<ANNOTATION_VALUE>{0}RefactoringTool: Refactored ./tgt/io.py
</ANNOTATION_VALUE>'.format(interval.text),
+ '\t</ALIGNABLE_ANNOTATION>',
+ '</ANNOTATION>']
annotation_id_count += 1
elif isinstance(tier, PointTier):
if include_point_tiers:
for point in tier.points:
annotations += [
- u'<ANNOTATION>',
- u'\t<ALIGNABLE_ANNOTATION ANNOTATION_ID="{0}" TIME_SLOT_REF1="{1}" TIME_SLOT_REF2="{2}">'.format('a' + str(annotation_id_count), get_time_slot_id(point.time), get_time_slot_id(point.time + point_tier_annotation_duration)),
- u'\t\t<ANNOTATION_VALUE>{0}</ANNOTATION_VALUE>'.format(point.text),
- u'\t</ALIGNABLE_ANNOTATION>',
- u'</ANNOTATION>']
+ '<ANNOTATION>',
+ '\t<ALIGNABLE_ANNOTATION ANNOTATION_ID="{0}" TIME_SLOT_REF1="{1}" TIME_SLOT_REF2="{2}">'.format('a' + str(annotation_id_count), get_time_slot_id(point.time), get_time_slot_id(point.time + point_tier_annotation_duration)),
+ '\t\t<ANNOTATION_VALUE>{0}</ANNOTATION_VALUE>'.format(point.text),
+ '\t</ALIGNABLE_ANNOTATION>',
+ '</ANNOTATION>']
annotation_id_count += 1
else:
raise Exception('Unknown tier type: {0}'.format(tier.name))
- annotations.append(u'</TIER>')
+ annotations.append('</TIER>')
# Create time stamp information
- time_info = [u'<TIME_ORDER>']
- for time_value, time_slot_id in time_slots.items():
- time_info.append(u'\t<TIME_SLOT TIME_SLOT_ID="{0}" TIME_VALUE="{1}"/>'.format(time_slot_id, str(time_value)))
- time_info.append(u'</TIME_ORDER>')
+ time_info = ['<TIME_ORDER>']
+ for time_value, time_slot_id in list(time_slots.items()):
+ time_info.append('\t<TIME_SLOT TIME_SLOT_ID="{0}" TIME_VALUE="{1}"/>'.format(time_slot_id, str(time_value)))
+ time_info.append('</TIME_ORDER>')
# Create ELAN footer
- foot = [u'<LINGUISTIC_TYPE GRAPHIC_REFERENCES="false" LINGUISTIC_TYPE_ID="default-lt" TIME_ALIGNABLE="true"/>',
- u'<LOCALE COUNTRY_CODE="US" LANGUAGE_CODE="en"/>',
- u'</ANNOTATION_DOCUMENT>']
+ foot = ['<LINGUISTIC_TYPE GRAPHIC_REFERENCES="false" LINGUISTIC_TYPE_ID="default-lt" TIME_ALIGNABLE="true"/>',
+ '<LOCALE COUNTRY_CODE="US" LANGUAGE_CODE="en"/>',
+ '</ANNOTATION_DOCUMENT>']
eaf = head + time_info + annotations + foot
return '\n'.join(eaf)
--- ./tgt/io.py (original)
+++ ./tgt/io.py (refactored)
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import division, print_function
+
import copy
import codecs
@@ -244,14 +244,14 @@
'"' + escape_text(tier.name) + '"',
tier.start_time, tier.end_time, len(tier)]
if isinstance(tier, IntervalTier):
- result += [u'{0}\n{1}\n"{2}"'.format(obj.start_time, obj.end_time, escape_text(obj.text))
+ result += ['{0}\n{1}\n"{2}"'.format(obj.start_time, obj.end_time, escape_text(obj.text))
for obj in tier]
elif isinstance(tier, PointTier):
- result += [u'{0}\n"{1}"'.format(obj.time, escape_text(obj.text))
+ result += ['{0}\n"{1}"'.format(obj.time, escape_text(obj.text))
for obj in tier]
else:
raise Exception('Unknown tier type: {0}'.format(tier.name))
- return '\n'.join([unicode(x) for x in result])
+ return '\n'.join([str(x) for x in result])
def export_to_long_textgrid(textgrid):
@@ -259,33 +259,33 @@
result = ['File type = "ooTextFile"',
'Object class = "TextGrid"',
'',
- 'xmin = ' + unicode(textgrid.start_time),
- 'xmax = ' + unicode(textgrid.end_time),
+ 'xmin = ' + str(textgrid.start_time),
+ 'xmax = ' + str(textgrid.end_time),
'tiers? <exists>',
- 'size = ' + unicode(len(textgrid)),
+ 'size = ' + str(len(textgrid)),
'item []:']
textgrid_corrected = correct_start_end_times_and_fill_gaps(textgrid)
for i, tier in enumerate(textgrid_corrected):
result += ['\titem [{0}]:'.format(i + 1),
'\t\tclass = "{0}"'.format(tier.tier_type()),
'\t\tname = "{0}"'.format(escape_text(tier.name)),
- '\t\txmin = ' + unicode(tier.start_time),
- '\t\txmax = ' + unicode(tier.end_time),
- '\t\tintervals: size = ' + unicode(len(tier))]
+ '\t\txmin = ' + str(tier.start_time),
+ '\t\txmax = ' + str(tier.end_time),
+ '\t\tintervals: size = ' + str(len(tier))]
if isinstance(tier, IntervalTier):
for j, obj in enumerate(tier):
result += ['\t\tintervals [{0}]:'.format(j + 1),
- '\t\t\txmin = ' + unicode(obj.start_time),
- '\t\t\txmax = ' + unicode(obj.end_time),
+ '\t\t\txmin = ' + str(obj.start_time),
+ '\t\t\txmax = ' + str(obj.end_time),
'\t\t\ttext = "' + escape_text(obj.text) + '"']
elif isinstance(tier, PointTier):
for j, obj in enumerate(tier):
result += ['\t\tpoints [{0}]:'.format(j + 1),
- '\t\t\tnumber = ' + unicode(obj.time),
+ '\t\t\tnumber = ' + str(obj.time),
'\t\t\tmark = "' + escape_text(obj.text) + '"']
else:
raise Exception('Unknown tier type: {0}'.format(tier.name))
- return '\n'.join([unicode(x) for x in result])
+ return '\n'.join([str(x) for x in result])
def export_to_elan(textgrid, encoding='utf-8', include_empty_intervals=False,
@@ -304,52 +304,52 @@
# Create ELAN header
head = [
- u'<?xml version="1.0" encoding="{0}"?>'.format(encoding.upper()),
- u'<ANNOTATION_DOCUMENT AUTHOR="TextGridTools" DATE="{0}" FORMAT="2.7" VERSION="2.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.mpi.nl/tools/elan/EAFv2.7.xsd">'.format(datetime.datetime.now().strftime('%Y-%m-%dT%H:%M:%S+00:00')),
- u'<HEADER MEDIA_FILE="" TIME_UNITS="milliseconds">',
- u'\t<PROPERTY NAME="lastUsedAnnotationId">0</PROPERTY>',
- u'</HEADER>']
+ '<?xml version="1.0" encoding="{0}"?>'.format(encoding.upper()),
+ '<ANNOTATION_DOCUMENT AUTHOR="TextGridTools" DATE="{0}" FORMAT="2.7" VERSION="2.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.mpi.nl/tools/elan/EAFv2.7.xsd">'.format(datetime.datetime.now().strftime('%Y-%m-%dT%H:%M:%S+00:00')),
+ '<HEADER MEDIA_FILE="" TIME_UNITS="milliseconds">',
+ '\t<PROPERTY NAME="lastUsedAnnotationId">0</PROPERTY>',
+ '</HEADER>']
# Create annotations
annotation_id_count = 1
annotations = []
textgrid_copy = correct_start_end_times_and_fill_gaps(textgrid) if include_empty_intervals else textgrid
for tier in textgrid_copy:
- annotations.append(u'<TIER DEFAULT_LOCALE="en" LINGUISTIC_TYPE_REF="default-lt" TIER_ID="{0}">'.format(tier.name))
+ annotations.append('<TIER DEFAULT_LOCALE="en" LINGUISTIC_TYPE_REF="default-lt" TIER_ID="{0}">'.format(tier.name))
if isinstance(tier, IntervalTier):
for interval in tier:
if not include_empty_intervals and interval.text == '':
continue
annotations += [
- u'<ANNOTATION>',
- u'\t<ALIGNABLE_ANNOTATION ANNOTATION_ID="{0}" TIME_SLOT_REF1="{1}" TIME_SLOT_REF2="{2}">'.format('a' + str(annotation_id_count), get_time_slot_id(interval.start_time), get_time_slot_id(interval.end_time)),
- u'\t\t<ANNOTATION_VALUE>{0}</ANNOTATION_VALUE>'.format(interval.text),
- u'\t</ALIGNABLE_ANNOTATION>',
- u'</ANNOTATION>']
+ '<ANNOTATION>',
+ '\t<ALIGNABLE_ANNOTATION ANNOTATION_ID="{0}" TIME_SLOT_REF1="{1}" TIME_SLOT_REF2="{2}">'.format('a' + str(annotation_id_count), get_time_slot_id(interval.start_time), get_time_slot_id(interval.end_time)),
+ '\t\t<ANNOTATION_VALUE>{0}</ANNOTATION_VALUE>'.format(interval.text),
+ '\t</ALIGNABLE_ANNOTATION>',
+ '</ANNOTATION>']
annotation_id_count += 1
elif isinstance(tier, PointTier):
if include_point_tiers:
for point in tier.points:
annotations += [
- u'<ANNOTATION>',
- u'\t<ALIGNABLE_ANNOTATION ANNOTATION_ID="{0}" TIME_SLOT_REF1="{1}" TIME_SLOT_REF2="{2}">'.format('a' + str(annotation_id_count), get_time_slot_id(point.time), get_time_slot_id(point.time + point_tier_annotation_duration)),
- u'\t\t<ANNOTATION_VALUE>{0}</ANNOTATION_VALUE>'.format(point.text),
- u'\t</ALIGNABLE_ANNOTATION>',
- u'</ANNOTATION>']
+ '<ANNOTATION>',
+ '\t<ALIGNABLE_ANNOTATION ANNOTATION_ID="{0}" TIME_SLOT_REF1="{1}" TIME_SLOT_REF2="{2}">'.format('a' + str(annotation_id_count), get_time_slot_id(point.time), get_time_slot_id(point.time + point_tier_annotation_duration)),
+ '\t\t<ANNOTATION_VALUE>{0}</ANNOTATION_VALUE>'.format(point.text),
+ '\t</ALIGNABLE_ANNOTATION>',
+ '</ANNOTATION>']
annotation_id_count += 1
else:
raise Exception('Unknown tier type: {0}'.format(tier.name))
- annotations.append(u'</TIER>')
+ annotations.append('</TIER>')
# Create time stamp information
- time_info = [u'<TIME_ORDER>']
- for time_value, time_slot_id in time_slots.items():
- time_info.append(u'\t<TIME_SLOT TIME_SLOT_ID="{0}" TIME_VALUE="{1}"/>'.format(time_slot_id, str(time_value)))
- time_info.append(u'</TIME_ORDER>')
+ time_info = ['<TIME_ORDER>']
+ for time_value, time_slot_id in list(time_slots.items()):
+ time_info.append('\t<TIME_SLOT TIME_SLOT_ID="{0}" TIME_VALUE="{1}"/>'.format(time_slot_id, str(time_value)))
+ time_info.append('</TIME_ORDER>')
# Create ELAN footer
- foot = [u'<LINGUISTIC_TYPE GRAPHIC_REFERENCES="false" LINGUISTIC_TYPE_ID="default-lt" TIME_ALIGNABLE="true"/>',
- u'<LOCALE COUNTRY_CODE="US" LANGUAGE_CODE="en"/>',
- u'</ANNOTATION_DOCUMENT>']
+ foot = ['<LINGUISTIC_TYPE GRAPHIC_REFERENCES="false" LINGUISTIC_TYPE_ID="default-lt" TIME_ALIGNABLE="true"/>',
+ '<LOCALE COUNTRY_CODE="US" LANGUAGE_CODE="en"/>',
+ '</ANNOTATION_DOCUMENT>']
eaf = head + time_info + annotations + foot
- return '\n'.join([unicode(x) for x in eaf])
+ return '\n'.join([str(x) for x in eaf])
def export_to_table(textgrid, separator=','):
@@ -361,15 +361,15 @@
if isinstance(tier, IntervalTier):
for obj in tier:
if obj.text:
- result.append(separator.join([unicode(tier.name), unicode(tier.tier_type()),
- unicode(obj.start_time), unicode(obj.end_time), obj.text]))
+ result.append(separator.join([str(tier.name), str(tier.tier_type()),
+ str(obj.start_time), str(obj.end_time), obj.text]))
elif isinstance(tier, PointTier):
for obj in tier:
- result.append(separator.join([unicode(tier.name), unicode(tier.tier_type()),
- unicode(obj.time), unicode(obj.time), obj.text]))
+ result.append(separator.join([str(tier.name), str(tier.tier_type()),
+ str(obj.time), str(obj.RefactoringTool: Refactored ./tgt/core.py
RefactoringTool: Refactored ./tgt/agreement.py
RefactoringTool: No changes to ./tgt/__init__.py
RefactoringTool: No changes to ./setup.py
RefactoringTool: Refactored ./scripts/tgt-shift-boundaries.py
RefactoringTool: Refactored ./scripts/tgt-print-tiernames.py
RefactoringTool: No changes to ./scripts/tgt-extract-part.py
RefactoringTool: No changes to ./scripts/tgt-concatenate-textgrids.py
RefactoringTool: Files that were modified:
RefactoringTool: ./tgt/util.py
RefactoringTool: ./tgt/io3.py
RefactoringTool: ./tgt/io.py
RefactoringTool: ./tgt/core.py
RefactoringTool: ./tgt/agreement.py
RefactoringTool: ./tgt/__init__.py
RefactoringTool: ./setup.py
RefactoringTool: ./scripts/tgt-shift-boundaries.py
RefactoringTool: ./scripts/tgt-print-tiernames.py
RefactoringTool: ./scripts/tgt-extract-part.py
RefactoringTool: ./scripts/tgt-concatenate-textgrids.py
time), obj.text]))
else:
raise Exception('Unknown tier type: {0}'.format(tier.name))
- return '\n'.join([unicode(x) for x in result])
+ return '\n'.join([str(x) for x in result])
# Listing of currently supported export formats.
--- ./tgt/core.py (original)
+++ ./tgt/core.py (refactored)
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import division
+
import bisect
import collections
@@ -420,7 +420,7 @@
overlapping with start or end are excluded.
'''
idx_lo, idx_hi = self._get_annotation_index_range_between_timepoints(start, end, left_overlap, right_overlap)
- r = range(idx_hi-1,idx_lo-1,-1)
+ r = list(range(idx_hi-1,idx_lo-1,-1))
for idx in r: # Needs to be done in reverse order
del self._objects[idx]
@@ -613,7 +613,7 @@
__hash__ = object.__hash__
def __repr__(self):
- return u'Annotation({0}, {1}, "{2}")'.format(self.start_time,
+ return 'Annotation({0}, {1}, "{2}")'.format(self.start_time,
self.end_time, self.text)
@@ -625,7 +625,7 @@
super(Interval, self).__init__(start_time, end_time, text)
def __repr__(self):
- return u'Interval({0}, {1}, "{2}")'.format(self.start_time, self.end_time, self.text)
+ return 'Interval({0}, {1}, "{2}")'.format(self.start_time, self.end_time, self.text)
class Point(Annotation):
@@ -650,7 +650,7 @@
doc='The point of time.')
def __repr__(self):
- return u'Point({0}, "{1}")'.format(self.time, self.text)
+ return 'Point({0}, "{1}")'.format(self.time, self.text)
class Time(float):
--- ./tgt/agreement.py (original)
+++ ./tgt/agreement.py (refactored)
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import division, print_function
+
import itertools
import re
@@ -181,7 +181,7 @@
'scott-pi': scott_pi}
if method not in _AGREEMENT_METHODS:
- available_methods = ', '.join(_AGREEMENT_METHODS.keys())
+ available_methods = ', '.join(list(_AGREEMENT_METHODS.keys()))
raise Exception('Unsupported method. Available options are {0}.'.format(available_methods))
elif len(tiers_list) < 2:
raise Exception('At least two tiers need to be provided')
--- ./scripts/tgt-shift-boundaries.py (original)
+++ ./scripts/tgt-shift-boundaries.py (refactored)
@@ -21,7 +21,7 @@
# If a directory is specified, all tier names of the .TextGrid
# files contained in this directory are printed.
-from __future__ import division, print_function
+
import argparse
import os.path
--- ./scripts/tgt-print-tiernames.py (original)
+++ ./scripts/tgt-print-tiernames.py (refactored)
@@ -21,7 +21,7 @@
# If a directory is specified, all tier names of the .TextGrid
# files contained in this directory are printed.
-from __future__ import print_function, division
+
import os
import sys
@@ -37,7 +37,7 @@
print(filename)
for tiername in tg.get_tier_names():
print('\t' + tiername)
- except Exception, err:
+ except Exception as err:
print(filename + ' caused a problem.')
sys.stderr.write('ERROR: %s\n' % str(err))
++ find ./ -name '*.py'
+ sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|' ./tgt/util.py ./tgt/io3.py ./tgt/io.py ./tgt/core.py ./tgt/agreement.py ./tgt/__init__.py ./setup.py ./scripts/tgt-shift-boundaries.py ./scripts/tgt-print-tiernames.py ./scripts/tgt-extract-part.py ./scripts/tgt-concatenate-textgrids.py
+ exit 0
Executing(%build): /bin/sh -e /usr/src/tmp/rpm-tmp.4294
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ cd tgt-1.4.3
+ CFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2 -march=i586 -mtune=generic'
+ export CFLAGS
+ CXXFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2 -march=i586 -mtune=generic'
+ export CXXFLAGS
+ FFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2 -march=i586 -mtune=generic'
+ export FFLAGS
+ /usr/bin/python3 setup.py build
running build
running build_py
creating build
creating build/lib
creating build/lib/tgt
copying tgt/__init__.py -> build/lib/tgt
copying tgt/agreement.py -> build/lib/tgt
copying tgt/core.py -> build/lib/tgt
copying tgt/io.py -> build/lib/tgt
copying tgt/io3.py -> build/lib/tgt
copying tgt/util.py -> build/lib/tgt
running build_scripts
creating build/scripts-3.7
copying and adjusting scripts/tgt-concatenate-textgrids.py -> build/scripts-3.7
copying and adjusting scripts/tgt-extract-part.py -> build/scripts-3.7
copying and adjusting scripts/tgt-print-tiernames.py -> build/scripts-3.7
copying and adjusting scripts/tgt-shift-boundaries.py -> build/scripts-3.7
changing mode of build/scripts-3.7/tgt-concatenate-textgrids.py from 644 to 755
changing mode of build/scripts-3.7/tgt-extract-part.py from 644 to 755
changing mode of build/scripts-3.7/tgt-print-tiernames.py from 644 to 755
changing mode of build/scripts-3.7/tgt-shift-boundaries.py from 644 to 755
+ exit 0
Executing(%install): /bin/sh -e /usr/src/tmp/rpm-tmp.64340
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ /bin/chmod -Rf u+rwX -- /usr/src/tmp/python3-module-tgt-buildroot
+ :
+ /bin/rm -rf -- /usr/src/tmp/python3-module-tgt-buildroot
+ cd tgt-1.4.3
+ CFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2 -march=i586 -mtune=generic'
+ export CFLAGS
+ CXXFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2 -march=i586 -mtune=generic'
+ export CXXFLAGS
+ FFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2 -march=i586 -mtune=generic'
+ export FFLAGS
+ /usr/bin/python3 setup.py install --skip-build --root=/usr/src/tmp/python3-module-tgt-buildroot --force
running install
running install_lib
creating /usr/src/tmp/python3-module-tgt-buildroot
creating /usr/src/tmp/python3-module-tgt-buildroot/usr
creating /usr/src/tmp/python3-module-tgt-buildroot/usr/lib
creating /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3
creating /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages
creating /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt
copying build/lib/tgt/util.py -> /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt
copying build/lib/tgt/io3.py -> /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt
copying build/lib/tgt/io.py -> /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt
copying build/lib/tgt/core.py -> /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt
copying build/lib/tgt/agreement.py -> /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt
copying build/lib/tgt/__init__.py -> /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt
byte-compiling /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/util.py to util.cpython-37.pyc
byte-compiling /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/io3.py to io3.cpython-37.pyc
byte-compiling /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/io.py to io.cpython-37.pyc
byte-compiling /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/core.py to core.cpython-37.pyc
byte-compiling /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/agreement.py to agreement.cpython-37.pyc
byte-compiling /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py to __init__.cpython-37.pyc
running install_scripts
creating /usr/src/tmp/python3-module-tgt-buildroot/usr/bin
copying build/scripts-3.7/tgt-shift-boundaries.py -> /usr/src/tmp/python3-module-tgt-buildroot/usr/bin
copying build/scripts-3.7/tgt-print-tiernames.py -> /usr/src/tmp/python3-module-tgt-buildroot/usr/bin
copying build/scripts-3.7/tgt-extract-part.py -> /usr/src/tmp/python3-module-tgt-buildroot/usr/bin
copying build/scripts-3.7/tgt-concatenate-textgrids.py -> /usr/src/tmp/python3-module-tgt-buildroot/usr/bin
changing mode of /usr/src/tmp/python3-module-tgt-buildroot/usr/bin/tgt-shift-boundaries.py to 755
changing mode of /usr/src/tmp/python3-module-tgt-buildroot/usr/bin/tgt-print-tiernames.py to 755
changing mode of /usr/src/tmp/python3-module-tgt-buildroot/usr/bin/tgt-extract-part.py to 755
changing mode of /usr/src/tmp/python3-module-tgt-buildroot/usr/bin/tgt-concatenate-textgrids.py to 755
running install_egg_info
Writing /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt-1.4.3-py3.7.egg-info
+ /usr/lib/rpm/brp-alt
Cleaning files in /usr/src/tmp/python3-module-tgt-buildroot (auto)
Verifying and fixing files in /usr/src/tmp/python3-module-tgt-buildroot (binconfig,pkgconfig,libtool,desktop)
Checking contents of files in /usr/src/tmp/python3-module-tgt-buildroot/ (default)
Compressing files in /usr/src/tmp/python3-module-tgt-buildroot (auto)
Adjusting library links in /usr/src/tmp/python3-module-tgt-buildroot
./usr/lib:
Verifying ELF objects in /usr/src/tmp/python3-module-tgt-buildroot (arch=normal,fhs=normal,lfs=relaxed,lint=relaxed,rpath=normal,stack=normal,textrel=normal,unresolved=normal)
Bytecompiling python modules in /usr/src/tmp/python3-module-tgt-buildroot using /usr/bin/python2.7
Bytecompiling python modules with optimization in /usr/src/tmp/python3-module-tgt-buildroot using /usr/bin/python2.7 -O
Bytecompiling python3 modules in /usr/src/tmp/python3-module-tgt-buildroot using /usr/bin/python3
unlink /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__pycache__/__init__.cpython-37.pyc
unlink /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__pycache__/agreement.cpython-37.pyc
unlink /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__pycache__/core.cpython-37.pyc
unlink /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__pycache__/io.cpython-37.pyc
unlink /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__pycache__/io3.cpython-37.pyc
unlink /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__pycache__/util.cpython-37.pyc
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/agreement.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/core.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/io.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/io3.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/util.py
Bytecompiling python3 modules with optimization in /usr/src/tmp/python3-module-tgt-buildroot using /usr/bin/python3 -O
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/agreement.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/core.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/io.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/io3.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/util.py
Bytecompiling python3 modules with optimization-2 in /usr/src/tmp/python3-module-tgt-buildroot using /usr/bin/python3 -OO
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/agreement.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/core.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/io.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/io3.py
compile /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/util.py
Hardlinking identical .pyc and .opt-?.pyc files
'./usr/lib/python3/site-packages/tgt/__pycache__/io3.cpython-37.opt-1.pyc' => './usr/lib/python3/site-packages/tgt/__pycache__/io3.cpython-37.pyc'
'./usr/lib/python3/site-packages/tgt/__pycache__/io.cpython-37.opt-1.pyc' => './usr/lib/python3/site-packages/tgt/__pycache__/io.cpython-37.pyc'
'./usr/lib/python3/site-packages/tgt/__pycache__/core.cpython-37.opt-1.pyc' => './usr/lib/python3/site-packages/tgt/__pycache__/core.cpython-37.pyc'
'./usr/lib/python3/site-packages/tgt/__pycache__/agreement.cpython-37.opt-1.pyc' => './usr/lib/python3/site-packages/tgt/__pycache__/agreement.cpython-37.pyc'
'./usr/lib/python3/site-packages/tgt/__pycache__/__init__.cpython-37.opt-1.pyc' => './usr/lib/python3/site-packages/tgt/__pycache__/__init__.cpython-37.pyc'
'./usr/lib/python3/site-packages/tgt/__pycache__/__init__.cpython-37.opt-2.pyc' => './usr/lib/python3/site-packages/tgt/__pycache__/__init__.cpython-37.opt-1.pyc'
Hardlinking identical .pyc and .pyo files
Processing files: python3-module-tgt-1.4.3-alt2
Finding Provides (using /usr/lib/rpm/find-provides)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.kOhsKN
find-provides: running scripts (alternatives,debuginfo,lib,pam,perl,pkgconfig,python,python3,shell)
Finding Requires (using /usr/lib/rpm/find-requires)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.I6ibuN
find-requires: running scripts (cpp,debuginfo,files,lib,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services)
python3.req: /usr/src/tmp/python3-module-tgt-buildroot/usr/bin/tgt-print-tiernames.py: skipping sys
python3.req: /usr/src/tmp/python3-module-tgt-buildroot/usr/bin/tgt-shift-boundaries.py: skipping sys
python3.req: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py: skipping sys
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py: line=21 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py: line=22 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py: line=23 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py: line=24 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py: line=25 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py: line=28 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py: line=29 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py: line=31 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py: line=32 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/__init__.py: line=34 possible relative import from ., UNIMPLEMENTED
python3.req: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/agreement.py: skipping itertools
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/agreement.py: line=26 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/io.py: line=27 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/io3.py: line=22 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python3-module-tgt-buildroot/usr/lib/python3/site-packages/tgt/util.py: line=25 possible relative import from ., UNIMPLEMENTED
Provides: python3(tgt), python3(tgt.agreement), python3(tgt.core), python3(tgt.io), python3(tgt.io3), python3(tgt.util)
Requires: /usr/bin/python3, /usr/lib/python3/site-packages, python3(argparse) < 0, python3(bisect) < 0, python3(codecs) < 0, python3(collections) < 0, python3(copy) < 0, python3(datetime) < 0, python3(math) < 0, python3(numpy) < 0, python3(operator) < 0, python3(os) < 0, python3(os.path) < 0, python3(re) < 0, python3(warnings) < 0, python3(xml.etree.ElementTree) < 0
Wrote: /usr/src/RPM/RPMS/noarch/python3-module-tgt-1.4.3-alt2.noarch.rpm
11.65user 0.96system 0:16.04elapsed 78%CPU (0avgtext+0avgdata 20156maxresident)k
0inputs+0outputs (0major+135508minor)pagefaults 0swaps
23.48user 8.14system 0:34.73elapsed 91%CPU (0avgtext+0avgdata 108988maxresident)k
0inputs+0outputs (0major+578535minor)pagefaults 0swaps