Application is a normal class again

no longer a special singleton thingy.

gaphor/application.py

@@ -44,7 +44,7 @@ class ComponentLookupError(LookupError):
     pass
 
 
-class _Application(Service, ActionProvider):
+class Application(Service, ActionProvider):
     """
     The Gaphor application is started from the gaphor.ui module.
 
@@ -55,21 +55,15 @@ class _Application(Service, ActionProvider):
     are registered in the "component_registry" service.
     """
 
-    def __init__(self):
+    def __init__(self, appservices=None):
         self.active_session: Optional[Session] = None
         self.sessions: Set[Session] = set()
-        self._services_by_name: Dict[str, Service] = {}
 
-    def __call__(self, appservices=None):
-        """Mimic object instantiation behavior."""
-        assert not self._services_by_name
         uninitialized_services = load_services("gaphor.appservices", appservices)
         self._services_by_name = init_services(uninitialized_services, application=self)
 
         transaction.subscribers.add(self._transaction_proxy)
 
-        return self
-
     def new_session(self, services=None):
         """
         Initialize an application session.
@@ -233,7 +227,3 @@ def init(name, cls):
         init(name, cls)
 
     return ready
-
-
-# Make sure there is only one!
-Application = _Application()

gaphor/ui/__init__.py

@@ -10,7 +10,7 @@
 
 import gi
 
-from gaphor.application import Application, _Application
+from gaphor.application import Application
 from gaphor.core import event_handler
 from gaphor.event import ActiveSessionChanged, SessionShutdown
 from gaphor.ui.actiongroup import apply_application_actions
@@ -84,7 +84,7 @@ def on_session_shutdown(event):
 
 
 def run(args):
-    application: Optional[_Application] = None
+    application: Optional[Application] = None
 
     def new_session():
         assert application