move subiquity.snapd to subiquitycore.snapd

debian/control

@@ -23,6 +23,8 @@ Depends: probert-network,
          python3-urwid (>= 1.2.1),
          python3-attr,
          python3-yaml,
+         python3-requests,
+         python3-requests-unixsocket,
          ${misc:Depends},
          ${python3:Depends}
 Description: Ubuntu Server Installer - core libraries

po/POTFILES.in

@@ -49,6 +49,7 @@ subiquitycore/ui/stretchy.py
 subiquitycore/ui/container.py
 subiquitycore/ui/frame.py
 subiquitycore/file_util.py
+subiquitycore/snapd.py
 subiquitycore/view.py
 subiquity/controllers/identity.py
 subiquity/controllers/package.py
@@ -76,7 +77,6 @@ subiquity/cmd/__init__.py
 subiquity/cmd/tui.py
 subiquity/cmd/schema.py
 subiquity/journald.py
-subiquity/snapd.py
 subiquity/lockfile.py
 subiquity/models/identity.py
 subiquity/models/locale.py

subiquity/core.py

@@ -35,6 +35,11 @@ from subiquitycore.async_helpers import (
     )
 from subiquitycore.controller import Skip
 from subiquitycore.core import Application
+from subiquitycore.snapd import (
+    AsyncSnapd,
+    FakeSnapdConnection,
+    SnapdConnection,
+    )
 from subiquitycore.view import BaseView
 
 from subiquity.controllers.error import (
@@ -43,11 +48,6 @@ from subiquity.controllers.error import (
 from subiquity.journald import journald_listener
 from subiquity.lockfile import Lockfile
 from subiquity.models.subiquity import SubiquityModel
-from subiquity.snapd import (
-    AsyncSnapd,
-    FakeSnapdConnection,
-    SnapdConnection,
-    )
 from subiquity.ui.frame import SubiquityUI
 from subiquity.ui.views.error import ErrorReportStretchy
 from subiquity.ui.views.help import HelpMenu

subiquitycore/snapd.py

@@ -31,7 +31,7 @@ from subiquitycore.utils import run_command
 import requests_unixsocket
 
 
-log = logging.getLogger('subiquity.snapd')
+log = logging.getLogger('subiquitycore.snapd')
 
 # Every method in this module blocks. Do not call them from the main thread!