From 1a58be08b4062da9a72adfb56c63d707674ca336 Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Thu, 17 Dec 2020 20:50:58 +0100
Subject: [PATCH] Remove Container base class
---
briar-gtk/briar_gtk/container.py | 21 ------------
.../briar_gtk/controllers/private_chat.py | 2 +-
...vate_chat.py => private_chat_container.py} | 0
briar-gtk/tests/briar_gtk/test_container.py | 34 -------------------
4 files changed, 1 insertion(+), 56 deletions(-)
delete mode 100644 briar-gtk/briar_gtk/container.py
rename briar-gtk/briar_gtk/{containers/private_chat.py => private_chat_container.py} (100%)
delete mode 100644 briar-gtk/tests/briar_gtk/test_container.py
diff --git a/briar-gtk/briar_gtk/container.py b/briar-gtk/briar_gtk/container.py
deleted file mode 100644
index e943d98..0000000
--- a/briar-gtk/briar_gtk/container.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2019 Nico Alt
-# SPDX-License-Identifier: AGPL-3.0-only
-# License-Filename: LICENSE.md
-
-import os
-
-from gi.repository import Gtk
-
-from briar_gtk.define import RESOURCES_DIR
-
-
-class Container(Gtk.Overlay):
-
- def __init__(self):
- super().__init__()
- self.builder = Gtk.Builder()
-
- def _add_from_resource(self, ui_filename):
- self.builder.add_from_resource(
- os.path.join(RESOURCES_DIR, ui_filename)
- )
diff --git a/briar-gtk/briar_gtk/controllers/private_chat.py b/briar-gtk/briar_gtk/controllers/private_chat.py
index 21ed834..2f01ed5 100644
--- a/briar-gtk/briar_gtk/controllers/private_chat.py
+++ b/briar-gtk/briar_gtk/controllers/private_chat.py
@@ -8,7 +8,7 @@ from gi.repository import Gtk
from briar_wrapper.models.contacts import Contacts
from briar_wrapper.models.private_chat import PrivateChat
-from briar_gtk.containers.private_chat import PrivateChatContainer
+from briar_gtk.private_chat_container import PrivateChatContainer
from briar_gtk.define import APP
from briar_gtk.widgets.edit_dialog import EditDialog
diff --git a/briar-gtk/briar_gtk/containers/private_chat.py b/briar-gtk/briar_gtk/private_chat_container.py
similarity index 100%
rename from briar-gtk/briar_gtk/containers/private_chat.py
rename to briar-gtk/briar_gtk/private_chat_container.py
diff --git a/briar-gtk/tests/briar_gtk/test_container.py b/briar-gtk/tests/briar_gtk/test_container.py
deleted file mode 100644
index 8a28b7d..0000000
--- a/briar-gtk/tests/briar_gtk/test_container.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2020 Nico Alt
-# SPDX-License-Identifier: AGPL-3.0-only
-# License-Filename: LICENSE.md
-
-import os
-
-import pytest
-
-from briar_gtk.container import Container
-
-MODULE = "briar_gtk.container.%s"
-
-
-@pytest.mark.skipif('CI' in os.environ, reason='segmentation fault')
-def test_builder_at_init(mocker):
- builder_mock = mocker.patch(
- MODULE % "Gtk.Builder")
-
- Container()
-
- builder_mock.assert_called_once()
-
-
-@pytest.fixture(autouse=True)
-def briar_headless_jar(is_file):
- flatpak_path = "/app/share/java/briar-headless.jar"
- return_values = {flatpak_path: True}
- is_file.side_effect = return_values.get
- return is_file
-
-
-@pytest.fixture(autouse=True)
-def gi_dependencies(mocker):
- mocker.patch(MODULE % "Gtk")
--
GitLab