From 9271f17dd2fcb610e3f16e206d0e3c0ba67174d1 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Thu, 2 Jul 2020 12:56:49 +1200
Subject: [PATCH] move subiquity.snapd to subiquitycore.snapd

---
 debian/control                        |  2 ++
 po/POTFILES.in                        |  2 +-
 subiquity/core.py                     | 10 +++++-----
 {subiquity => subiquitycore}/snapd.py |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)
 rename {subiquity => subiquitycore}/snapd.py (99%)

diff --git a/debian/control b/debian/control
index c4088164..d1db2041 100644
--- a/debian/control
+++ b/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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 17226de5..02777b85 100644
--- a/po/POTFILES.in
+++ b/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
diff --git a/subiquity/core.py b/subiquity/core.py
index d706ec5f..65b086c2 100644
--- a/subiquity/core.py
+++ b/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
diff --git a/subiquity/snapd.py b/subiquitycore/snapd.py
similarity index 99%
rename from subiquity/snapd.py
rename to subiquitycore/snapd.py
index f13c4757..0d795749 100644
--- a/subiquity/snapd.py
+++ b/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!