diff --git a/ubuntutools/archive.py b/ubuntutools/archive.py index b42ef90..b271db7 100644 --- a/ubuntutools/archive.py +++ b/ubuntutools/archive.py @@ -591,7 +591,7 @@ class FakeSPPH(object): if block.version <= since_version: break new_entries.append(str(block)) - return u''.join(new_entries) + return ''.join(new_entries) def rmadison(url, package, suite=None, arch=None): diff --git a/ubuntutools/lp/lpapicache.py b/ubuntutools/lp/lpapicache.py index f208a33..11edb15 100644 --- a/ubuntutools/lp/lpapicache.py +++ b/ubuntutools/lp/lpapicache.py @@ -577,7 +577,7 @@ class SourcePackagePublishingHistory(BaseWrapper): if block.version <= since_version: break new_entries.append(str(block)) - return u''.join(new_entries) + return ''.join(new_entries) def getBinaries(self): ''' diff --git a/ubuntutools/requestsync/mail.py b/ubuntutools/requestsync/mail.py index 5a049d4..729fe60 100644 --- a/ubuntutools/requestsync/mail.py +++ b/ubuntutools/requestsync/mail.py @@ -104,7 +104,7 @@ def get_ubuntu_delta_changelog(srcpkg): ''' changelog = Changelog(srcpkg.getChangelog()) if changelog is None: - return u'' + return '' delta = [] debian_info = DebianDistroInfo() for block in changelog: @@ -114,7 +114,7 @@ def get_ubuntu_delta_changelog(srcpkg): delta += [str(change) for change in block.changes() if change.strip()] - return u'\n'.join(delta) + return '\n'.join(delta) def mail_bug(srcpkg, subscribe, status, bugtitle, bugtext, bug_mail_domain, @@ -164,7 +164,7 @@ def mail_bug(srcpkg, subscribe, status, bugtitle, bugtext, bug_mail_domain, sys.exit(1) # generate email - mail = u'''\ + mail = '''\ From: %s To: %s Subject: %s