style: Sort Python imports with isort

```
isort -l 99 --profile=black .
```

Signed-off-by: Benjamin Drung <benjamin.drung@canonical.com>
This commit is contained in:
Benjamin Drung 2023-01-30 21:28:47 +01:00
parent db0e091e44
commit 4e27045f49
37 changed files with 134 additions and 178 deletions

View File

@ -31,22 +31,21 @@ try:
import lsb_release import lsb_release
except ImportError: except ImportError:
lsb_release = None lsb_release = None
from httplib2 import Http, HttpLib2Error
from distro_info import DebianDistroInfo, UbuntuDistroInfo from distro_info import DebianDistroInfo, UbuntuDistroInfo
from httplib2 import Http, HttpLib2Error
from ubuntutools.archive import DebianSourcePackage, UbuntuSourcePackage, DownloadError
from ubuntutools.config import UDTConfig, ubu_email
from ubuntutools.builder import get_builder
from ubuntutools.lp.lpapicache import (
Launchpad,
Distribution,
SeriesNotFoundException,
PackageNotFoundException,
)
from ubuntutools.misc import system_distribution, vendor_to_distroinfo, codename_to_distribution
from ubuntutools.question import YesNoQuestion
from ubuntutools import getLogger from ubuntutools import getLogger
from ubuntutools.archive import DebianSourcePackage, DownloadError, UbuntuSourcePackage
from ubuntutools.builder import get_builder
from ubuntutools.config import UDTConfig, ubu_email
from ubuntutools.lp.lpapicache import (
Distribution,
Launchpad,
PackageNotFoundException,
SeriesNotFoundException,
)
from ubuntutools.misc import codename_to_distribution, system_distribution, vendor_to_distroinfo
from ubuntutools.question import YesNoQuestion
Logger = getLogger() Logger = getLogger()

View File

@ -24,12 +24,11 @@
import sys import sys
from optparse import OptionParser from optparse import OptionParser
from launchpadlib.launchpad import Launchpad
from launchpadlib.errors import HTTPError from launchpadlib.errors import HTTPError
from launchpadlib.launchpad import Launchpad
from ubuntutools.config import UDTConfig
from ubuntutools import getLogger from ubuntutools import getLogger
from ubuntutools.config import UDTConfig
Logger = getLogger() Logger = getLogger()

View File

@ -21,9 +21,9 @@
# this program; if not, write to the Free Software Foundation, Inc., # this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import sys
import optparse import optparse
import os.path import os.path
import sys
import apt import apt

View File

@ -19,14 +19,13 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import json
import optparse import optparse
import sys import sys
import json
from httplib2 import Http, HttpLib2Error from httplib2 import Http, HttpLib2Error
import ubuntutools.misc import ubuntutools.misc
from ubuntutools import getLogger from ubuntutools import getLogger
Logger = getLogger() Logger = getLogger()

View File

@ -22,17 +22,16 @@
# ################################################################## # ##################################################################
import argparse import argparse
import debianbts
import logging import logging
import re import re
import sys import sys
import webbrowser import webbrowser
import debianbts
from launchpadlib.launchpad import Launchpad from launchpadlib.launchpad import Launchpad
from ubuntutools.config import UDTConfig
from ubuntutools import getLogger from ubuntutools import getLogger
from ubuntutools.config import UDTConfig
Logger = getLogger() Logger = getLogger()

View File

@ -31,21 +31,20 @@
import os import os
import os.path import os.path
import sys
import subprocess
import shutil import shutil
import subprocess
import sys
from contextlib import suppress
import debian.deb822 import debian.deb822
from contextlib import suppress from distro_info import DebianDistroInfo, DistroDataOutdated, UbuntuDistroInfo
from distro_info import DebianDistroInfo, UbuntuDistroInfo, DistroDataOutdated
import ubuntutools.misc import ubuntutools.misc
import ubuntutools.version import ubuntutools.version
from ubuntutools import getLogger
from ubuntutools.config import UDTConfig from ubuntutools.config import UDTConfig
from ubuntutools.question import YesNoQuestion from ubuntutools.question import YesNoQuestion
from ubuntutools import getLogger
Logger = getLogger() Logger = getLogger()

View File

@ -22,12 +22,11 @@ import sys
import debian.changelog import debian.changelog
from ubuntutools import getLogger
from ubuntutools.archive import DebianSourcePackage, DownloadError from ubuntutools.archive import DebianSourcePackage, DownloadError
from ubuntutools.config import UDTConfig from ubuntutools.config import UDTConfig
from ubuntutools.version import Version from ubuntutools.version import Version
from ubuntutools import getLogger
Logger = getLogger() Logger = getLogger()

View File

@ -14,20 +14,19 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
from collections import defaultdict
import optparse import optparse
import sys import sys
from collections import defaultdict
import apt import apt
from distro_info import UbuntuDistroInfo from distro_info import UbuntuDistroInfo
from ubuntutools.config import UDTConfig
from ubuntutools.lp.lpapicache import Launchpad, Distribution
from ubuntutools.lp.udtexceptions import PackageNotFoundException
from ubuntutools.question import YesNoQuestion, EditBugReport, confirmation_prompt
from ubuntutools.rdepends import query_rdepends, RDependsException
from ubuntutools import getLogger from ubuntutools import getLogger
from ubuntutools.config import UDTConfig
from ubuntutools.lp.lpapicache import Distribution, Launchpad
from ubuntutools.lp.udtexceptions import PackageNotFoundException
from ubuntutools.question import EditBugReport, YesNoQuestion, confirmation_prompt
from ubuntutools.rdepends import RDependsException, query_rdepends
Logger = getLogger() Logger = getLogger()

View File

@ -32,14 +32,13 @@ import sys
from distro_info import UbuntuDistroInfo from distro_info import UbuntuDistroInfo
from ubuntutools import getLogger
from ubuntutools.config import UDTConfig, ubu_email from ubuntutools.config import UDTConfig, ubu_email
from ubuntutools.lp import udtexceptions from ubuntutools.lp import udtexceptions
from ubuntutools.misc import require_utf8 from ubuntutools.misc import require_utf8
from ubuntutools.question import confirmation_prompt, EditBugReport from ubuntutools.question import EditBugReport, confirmation_prompt
from ubuntutools.version import Version from ubuntutools.version import Version
from ubuntutools import getLogger
Logger = getLogger() Logger = getLogger()
# #
@ -176,15 +175,15 @@ def main():
# import the needed requestsync module # import the needed requestsync module
if options.lpapi: if options.lpapi:
from ubuntutools.lp.lpapicache import Distribution, Launchpad
from ubuntutools.requestsync.lp import ( from ubuntutools.requestsync.lp import (
check_existing_reports, check_existing_reports,
get_debian_srcpkg, get_debian_srcpkg,
get_ubuntu_srcpkg,
get_ubuntu_delta_changelog, get_ubuntu_delta_changelog,
get_ubuntu_srcpkg,
need_sponsorship, need_sponsorship,
post_bug, post_bug,
) )
from ubuntutools.lp.lpapicache import Distribution, Launchpad
# See if we have LP credentials and exit if we don't - # See if we have LP credentials and exit if we don't -
# cannot continue in this case # cannot continue in this case
@ -198,8 +197,8 @@ def main():
from ubuntutools.requestsync.mail import ( from ubuntutools.requestsync.mail import (
check_existing_reports, check_existing_reports,
get_debian_srcpkg, get_debian_srcpkg,
get_ubuntu_srcpkg,
get_ubuntu_delta_changelog, get_ubuntu_delta_changelog,
get_ubuntu_srcpkg,
mail_bug, mail_bug,
need_sponsorship, need_sponsorship,
) )

View File

@ -19,10 +19,9 @@ import sys
from distro_info import DistroDataOutdated from distro_info import DistroDataOutdated
from ubuntutools.misc import system_distribution, vendor_to_distroinfo, codename_to_distribution
from ubuntutools.rdepends import query_rdepends, RDependsException
from ubuntutools import getLogger from ubuntutools import getLogger
from ubuntutools.misc import codename_to_distribution, system_distribution, vendor_to_distroinfo
from ubuntutools.rdepends import RDependsException, query_rdepends
Logger = getLogger() Logger = getLogger()

View File

@ -22,9 +22,8 @@ import os
import time import time
import urllib.request import urllib.request
from ubuntutools.lp.lpapicache import Distribution, Launchpad, PackageNotFoundException
from ubuntutools import getLogger from ubuntutools import getLogger
from ubuntutools.lp.lpapicache import Distribution, Launchpad, PackageNotFoundException
Logger = getLogger() Logger = getLogger()

View File

@ -1,10 +1,11 @@
#!/usr/bin/python3 #!/usr/bin/python3
from setuptools import setup
import glob import glob
import os import os
import re import re
from setuptools import setup
def make_pep440_compliant(version: str) -> str: def make_pep440_compliant(version: str) -> str:
"""Convert the version into a PEP440 compliant version.""" """Convert the version into a PEP440 compliant version."""

View File

@ -14,18 +14,17 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
import logging
import optparse import optparse
import os import os
import shutil import shutil
import sys import sys
import tempfile import tempfile
import logging
from ubuntutools.builder import get_builder
from ubuntutools.config import UDTConfig
from ubuntutools.sponsor_patch.sponsor_patch import sponsor_patch, check_dependencies
from ubuntutools import getLogger from ubuntutools import getLogger
from ubuntutools.builder import get_builder
from ubuntutools.config import UDTConfig
from ubuntutools.sponsor_patch.sponsor_patch import check_dependencies, sponsor_patch
Logger = getLogger() Logger = getLogger()

View File

@ -27,19 +27,16 @@ import os
import re import re
import shutil import shutil
import sys import sys
from subprocess import DEVNULL, PIPE, Popen, call, check_call, run
from subprocess import call, check_call, run, Popen, PIPE, DEVNULL
from tempfile import mkdtemp from tempfile import mkdtemp
from debian.changelog import Changelog from debian.changelog import Changelog
from distro_info import UbuntuDistroInfo, DistroDataOutdated from distro_info import DistroDataOutdated, UbuntuDistroInfo
from ubuntutools.config import ubu_email
from ubuntutools.question import YesNoQuestion, EditFile
from ubuntutools.update_maintainer import update_maintainer, restore_maintainer
from ubuntutools import getLogger from ubuntutools import getLogger
from ubuntutools.config import ubu_email
from ubuntutools.question import EditFile, YesNoQuestion
from ubuntutools.update_maintainer import restore_maintainer, update_maintainer
Logger = getLogger() Logger = getLogger()

View File

@ -32,7 +32,8 @@ import urllib.request
from lazr.restfulclient.errors import HTTPError from lazr.restfulclient.errors import HTTPError
from ubuntutools.archive import DebianSourcePackage, UbuntuSourcePackage, DownloadError from ubuntutools import getLogger
from ubuntutools.archive import DebianSourcePackage, DownloadError, UbuntuSourcePackage
from ubuntutools.config import UDTConfig, ubu_email from ubuntutools.config import UDTConfig, ubu_email
from ubuntutools.lp import udtexceptions from ubuntutools.lp import udtexceptions
from ubuntutools.lp.lpapicache import ( from ubuntutools.lp.lpapicache import (
@ -43,12 +44,10 @@ from ubuntutools.lp.lpapicache import (
) )
from ubuntutools.misc import split_release_pocket from ubuntutools.misc import split_release_pocket
from ubuntutools.question import YesNoQuestion from ubuntutools.question import YesNoQuestion
from ubuntutools.requestsync.mail import get_debian_srcpkg as requestsync_mail_get_debian_srcpkg
from ubuntutools.requestsync.lp import get_debian_srcpkg, get_ubuntu_srcpkg from ubuntutools.requestsync.lp import get_debian_srcpkg, get_ubuntu_srcpkg
from ubuntutools.requestsync.mail import get_debian_srcpkg as requestsync_mail_get_debian_srcpkg
from ubuntutools.version import Version from ubuntutools.version import Version
from ubuntutools import getLogger
Logger = getLogger() Logger = getLogger()

View File

@ -22,20 +22,19 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
# Our modules to import.
import sys import sys
from optparse import OptionGroup from optparse import OptionGroup, OptionParser
from optparse import OptionParser
from ubuntutools.lp.udtexceptions import (
SeriesNotFoundException,
PackageNotFoundException,
PocketDoesNotExistError,
)
from ubuntutools.lp.lpapicache import Distribution, Launchpad, PersonTeam
from launchpadlib.credentials import TokenAuthorizationException from launchpadlib.credentials import TokenAuthorizationException
from ubuntutools.misc import split_release_pocket
from ubuntutools import getLogger from ubuntutools import getLogger
from ubuntutools.lp.lpapicache import Distribution, Launchpad, PersonTeam
from ubuntutools.lp.udtexceptions import (
PackageNotFoundException,
PocketDoesNotExistError,
SeriesNotFoundException,
)
from ubuntutools.misc import split_release_pocket
Logger = getLogger() Logger = getLogger()

View File

@ -17,18 +17,17 @@
import optparse import optparse
import sys import sys
from ubuntutools import getLogger
from ubuntutools.lp.lpapicache import ( from ubuntutools.lp.lpapicache import (
Launchpad,
Distribution, Distribution,
PersonTeam, Launchpad,
Packageset,
PackageNotFoundException, PackageNotFoundException,
Packageset,
PersonTeam,
SeriesNotFoundException, SeriesNotFoundException,
) )
from ubuntutools.misc import split_release_pocket from ubuntutools.misc import split_release_pocket
from ubuntutools import getLogger
Logger = getLogger() Logger = getLogger()

View File

@ -27,52 +27,48 @@ Approach:
3. Verify checksums. 3. Verify checksums.
""" """
from urllib.request import urlopen, urlparse, urljoin
import codecs import codecs
import functools import functools
import json import json
import logging
import os import os
import re import re
import subprocess import subprocess
import sys import sys
import tempfile import tempfile
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from debian.changelog import Changelog
import debian.deb822
from contextlib import closing from contextlib import closing
from pathlib import Path from pathlib import Path
from urllib.request import urljoin, urlopen, urlparse
import debian.deb822
from debian.changelog import Changelog
from ubuntutools.config import UDTConfig from ubuntutools.config import UDTConfig
from ubuntutools.lp.lpapicache import ( from ubuntutools.lp.lpapicache import (
Launchpad,
Distribution, Distribution,
HTTPError,
Launchpad,
PersonTeam, PersonTeam,
Project, Project,
SourcePackagePublishingHistory, SourcePackagePublishingHistory,
HTTPError,
) )
from ubuntutools.lp.udtexceptions import ( from ubuntutools.lp.udtexceptions import (
PackageNotFoundException,
SeriesNotFoundException,
PocketDoesNotExistError,
InvalidDistroValueError, InvalidDistroValueError,
PackageNotFoundException,
PocketDoesNotExistError,
SeriesNotFoundException,
) )
from ubuntutools.misc import ( from ubuntutools.misc import (
DownloadError,
NotFoundError,
download, download,
download_bytes, download_bytes,
verify_file_checksum, verify_file_checksum,
verify_file_checksums, verify_file_checksums,
DownloadError,
NotFoundError,
) )
from ubuntutools.version import Version from ubuntutools.version import Version
import logging
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)

View File

@ -18,11 +18,10 @@
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# #
import logging
import os import os
import subprocess import subprocess
import logging
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)

View File

@ -15,15 +15,14 @@
# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
import locale
import logging
import os import os
import pwd import pwd
import re import re
import shlex import shlex
import socket import socket
import sys import sys
import locale
import logging
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)

View File

@ -22,28 +22,19 @@
# Based on code written by Jonathan Davies <jpds@ubuntu.com> # Based on code written by Jonathan Davies <jpds@ubuntu.com>
import collections import collections
import logging
import os import os
import re import re
from copy import copy from copy import copy
from debian.changelog import Changelog
from launchpadlib.launchpad import Launchpad as LP
from launchpadlib.errors import HTTPError
from lazr.restfulclient.resource import Entry
from urllib.error import URLError from urllib.error import URLError
from urllib.parse import urlparse from urllib.parse import urlparse
from ubuntutools.version import Version from debian.changelog import Changelog
from ubuntutools.lp import service, api_version from launchpadlib.errors import HTTPError
from ubuntutools.misc import ( from launchpadlib.launchpad import Launchpad as LP
download_text, from lazr.restfulclient.resource import Entry
host_architecture,
DEFAULT_POCKETS, from ubuntutools.lp import api_version, service
POCKETS,
DEFAULT_STATUSES,
STATUSES,
)
from ubuntutools.lp.udtexceptions import ( from ubuntutools.lp.udtexceptions import (
AlreadyLoggedInError, AlreadyLoggedInError,
ArchiveNotFoundException, ArchiveNotFoundException,
@ -52,8 +43,15 @@ from ubuntutools.lp.udtexceptions import (
PocketDoesNotExistError, PocketDoesNotExistError,
SeriesNotFoundException, SeriesNotFoundException,
) )
from ubuntutools.misc import (
import logging DEFAULT_POCKETS,
DEFAULT_STATUSES,
POCKETS,
STATUSES,
download_text,
host_architecture,
)
from ubuntutools.version import Version
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)

View File

@ -22,23 +22,22 @@
# #
# ################################################################## # ##################################################################
import distro_info
import hashlib import hashlib
import locale import locale
import logging
import os import os
import requests
import shutil import shutil
import sys import sys
import tempfile import tempfile
from contextlib import suppress from contextlib import suppress
from pathlib import Path from pathlib import Path
from subprocess import check_output, CalledProcessError from subprocess import CalledProcessError, check_output
from urllib.parse import urlparse from urllib.parse import urlparse
from ubuntutools.lp.udtexceptions import PocketDoesNotExistError import distro_info
import requests
import logging from ubuntutools.lp.udtexceptions import PocketDoesNotExistError
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)

View File

@ -22,47 +22,43 @@
# ################################################################## # ##################################################################
import errno
import logging
import os import os
import re import re
import sys
import errno
import subprocess import subprocess
import sys
from argparse import ArgumentParser from argparse import ArgumentParser
from urllib.parse import urlparse
from distro_info import DebianDistroInfo from distro_info import DebianDistroInfo
from urllib.parse import urlparse # by default we use standard logging.getLogger() and only use
# ubuntutools.getLogger() in PullPkg().main()
from ubuntutools import getLogger as ubuntutools_getLogger
from ubuntutools.archive import ( from ubuntutools.archive import (
UbuntuSourcePackage,
DebianSourcePackage, DebianSourcePackage,
UbuntuCloudArchiveSourcePackage,
PersonalPackageArchiveSourcePackage, PersonalPackageArchiveSourcePackage,
UbuntuCloudArchiveSourcePackage,
UbuntuSourcePackage,
) )
from ubuntutools.config import UDTConfig from ubuntutools.config import UDTConfig
from ubuntutools.lp.lpapicache import Distribution, Launchpad from ubuntutools.lp.lpapicache import Distribution, Launchpad
from ubuntutools.lp.udtexceptions import ( from ubuntutools.lp.udtexceptions import (
AlreadyLoggedInError, AlreadyLoggedInError,
SeriesNotFoundException, InvalidDistroValueError,
PackageNotFoundException, PackageNotFoundException,
PocketDoesNotExistError, PocketDoesNotExistError,
InvalidDistroValueError, SeriesNotFoundException,
) )
from ubuntutools.misc import ( from ubuntutools.misc import (
split_release_pocket,
host_architecture,
download,
UPLOAD_QUEUE_STATUSES,
STATUSES, STATUSES,
UPLOAD_QUEUE_STATUSES,
download,
host_architecture,
split_release_pocket,
) )
# by default we use standard logging.getLogger() and only use
# ubuntutools.getLogger() in PullPkg().main()
from ubuntutools import getLogger as ubuntutools_getLogger
import logging
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)
PULL_SOURCE = "source" PULL_SOURCE = "source"

View File

@ -16,11 +16,11 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
import tempfile
import os import os
import re import re
import subprocess import subprocess
import sys import sys
import tempfile
class Question(object): class Question(object):

View File

@ -20,6 +20,7 @@
# Please see the /usr/share/common-licenses/GPL-2 file for the full text # Please see the /usr/share/common-licenses/GPL-2 file for the full text
# of the GNU General Public License license. # of the GNU General Public License license.
import logging
import re import re
from debian.deb822 import Changes from debian.deb822 import Changes
@ -28,15 +29,13 @@ from httplib2 import Http, HttpLib2Error
from ubuntutools.lp import udtexceptions from ubuntutools.lp import udtexceptions
from ubuntutools.lp.lpapicache import ( from ubuntutools.lp.lpapicache import (
Launchpad,
Distribution, Distribution,
PersonTeam,
DistributionSourcePackage, DistributionSourcePackage,
Launchpad,
PersonTeam,
) )
from ubuntutools.question import confirmation_prompt from ubuntutools.question import confirmation_prompt
import logging
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)

View File

@ -20,12 +20,13 @@
# Please see the /usr/share/common-licenses/GPL-2 file for the full text # Please see the /usr/share/common-licenses/GPL-2 file for the full text
# of the GNU General Public License license. # of the GNU General Public License license.
import logging
import os import os
import re import re
import sys
import smtplib import smtplib
import socket import socket
import subprocess import subprocess
import sys
import tempfile import tempfile
from debian.changelog import Changelog from debian.changelog import Changelog
@ -33,9 +34,7 @@ from distro_info import DebianDistroInfo, DistroDataOutdated
from ubuntutools.archive import DebianSourcePackage, UbuntuSourcePackage from ubuntutools.archive import DebianSourcePackage, UbuntuSourcePackage
from ubuntutools.lp.udtexceptions import PackageNotFoundException from ubuntutools.lp.udtexceptions import PackageNotFoundException
from ubuntutools.question import confirmation_prompt, YesNoQuestion from ubuntutools.question import YesNoQuestion, confirmation_prompt
import logging
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)

View File

@ -15,6 +15,7 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
import logging
import os import os
import re import re
from urllib.parse import unquote from urllib.parse import unquote
@ -25,8 +26,6 @@ import httplib2
from ubuntutools.version import Version from ubuntutools.version import Version
import logging
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)

View File

@ -15,14 +15,13 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
import logging
import os import os
import re import re
import subprocess import subprocess
from ubuntutools.sponsor_patch.question import ask_for_manual_fixing
from functools import reduce from functools import reduce
import logging from ubuntutools.sponsor_patch.question import ask_for_manual_fixing
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)

View File

@ -15,6 +15,7 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
import logging
import os import os
import re import re
import subprocess import subprocess
@ -24,15 +25,12 @@ import debian.changelog
import debian.deb822 import debian.deb822
from ubuntutools.question import Question, YesNoQuestion from ubuntutools.question import Question, YesNoQuestion
from ubuntutools.sponsor_patch.question import ( from ubuntutools.sponsor_patch.question import (
ask_for_ignoring_or_fixing, ask_for_ignoring_or_fixing,
ask_for_manual_fixing, ask_for_manual_fixing,
user_abort, user_abort,
) )
import logging
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)

View File

@ -15,6 +15,7 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
import logging
import os import os
import pwd import pwd
import shutil import shutil
@ -22,18 +23,14 @@ import subprocess
import sys import sys
from distro_info import UbuntuDistroInfo from distro_info import UbuntuDistroInfo
from launchpadlib.launchpad import Launchpad from launchpadlib.launchpad import Launchpad
from ubuntutools.update_maintainer import update_maintainer, MaintainerUpdateException
from ubuntutools.question import input_number from ubuntutools.question import input_number
from ubuntutools.sponsor_patch.bugtask import BugTask, is_sync from ubuntutools.sponsor_patch.bugtask import BugTask, is_sync
from ubuntutools.sponsor_patch.patch import Patch from ubuntutools.sponsor_patch.patch import Patch
from ubuntutools.sponsor_patch.question import ask_for_manual_fixing from ubuntutools.sponsor_patch.question import ask_for_manual_fixing
from ubuntutools.sponsor_patch.source_package import SourcePackage from ubuntutools.sponsor_patch.source_package import SourcePackage
from ubuntutools.update_maintainer import MaintainerUpdateException, update_maintainer
import logging
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)

View File

@ -17,8 +17,8 @@
import os import os
import subprocess import subprocess
import tempfile import tempfile
from pathlib import Path from pathlib import Path
from ubuntutools.version import Version from ubuntutools.version import Version

View File

@ -18,11 +18,9 @@
import filecmp import filecmp
import tempfile import tempfile
import unittest import unittest
import ubuntutools.archive
from pathlib import Path from pathlib import Path
import ubuntutools.archive
from ubuntutools.test.example_package import ExamplePackage from ubuntutools.test.example_package import ExamplePackage

View File

@ -18,7 +18,6 @@
import locale import locale
import os import os
import unittest import unittest
from io import StringIO from io import StringIO
from unittest import mock from unittest import mock

View File

@ -19,7 +19,6 @@ import unittest
from setup import scripts from setup import scripts
TIMEOUT = 10 TIMEOUT = 10

View File

@ -18,7 +18,6 @@
import os import os
import unittest import unittest
from io import StringIO from io import StringIO
from unittest import mock from unittest import mock

View File

@ -16,13 +16,12 @@
"""This module is for updating the Maintainer field of an Ubuntu package.""" """This module is for updating the Maintainer field of an Ubuntu package."""
import logging
import os import os
import re import re
import debian.changelog import debian.changelog
import logging
Logger = logging.getLogger(__name__) Logger = logging.getLogger(__name__)
# Prior May 2009 these Maintainers were used: # Prior May 2009 these Maintainers were used:

View File

@ -19,9 +19,9 @@ import os
import sys import sys
from ubuntutools.update_maintainer import ( from ubuntutools.update_maintainer import (
update_maintainer,
restore_maintainer,
MaintainerUpdateException, MaintainerUpdateException,
restore_maintainer,
update_maintainer,
) )