#3930 rename for consistency with prefix

Xpra-org · Sep 2, 2023 · 140aff0 · 140aff0
1 parent 2980d8f
commit 140aff0
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 374 deletions.
diff --git a/docs/Subsystems/Logging.md b/docs/Subsystems/Logging.md
@@ -9,11 +9,11 @@ but it can also be used in the opposite direction.
 
 ## Implementations
 
-| Component         | Link                                                                            |
-|-------------------|---------------------------------------------------------------------------------|
-| client            | [xpra.client.mixins.remote_logging](../../xpra/client/mixins/remote_logging.py) |
-| client connection | none                                                                            |
-| server            | [xpra.server.mixins.logging](../../xpra/server/mixins/logging.py)               |
+| Component         | Link                                                                |
+|-------------------|---------------------------------------------------------------------|
+| client            | [xpra.client.mixins.logging](../../xpra/client/mixins/logging.py)   |
+| client connection | none                                                                |
+| server            | [xpra.server.mixins.logging](../../xpra/server/mixins/logging.py)   |
 
 
 ## Capabilities

diff --git a/docs/Subsystems/Notifications.md b/docs/Subsystems/Notifications.md
@@ -7,7 +7,7 @@ For usage related information, see [notitications feature](../Features/Notificat
 
 | Component         | Link                                                                          |
 |-------------------|-------------------------------------------------------------------------------|
-| client            | [xpra.client.mixins.notifications](../../xpra/client/mixins/notifications.py) |
+| client            | [xpra.client.mixins.notification](../../xpra/client/mixins/notification.py)   |
 | client connection | [xpra.server.source.notification](../../xpra/server/source/notification.py)   |
 | server            | [xpra.server.mixins.notification](../../xpra/server/mixins/notification.py)   |
 
@@ -33,7 +33,7 @@ The server exposes a single `enabled` flag using the `notifications` capability
 | Argument                    | Type                    | Notes                            |
 |-----------------------------|-------------------------|----------------------------------|
 | `dbus_id`                   | `integer`               | 0 if unused                      |
-| `notification id`           | `integer`               | should be unique                 |                
+| `notification id`           | `integer`               | should be unique                 |
 | `applciation name`          | `string`                |                                  |
 | `replaced notification id`  | `integer`               | 0 if unused                      |
 | `application icon`          | `string`                | the name of the icon to show     |
@@ -54,6 +54,6 @@ The icon data is a list or tuple with 4 elements:
 | `width`  | `integer` |
 | `height` | `integer` |
 | `data`   | `bytes`   |
- 
+
 The only format which is guaranteed to be supported is `png`.
 Other formats should not be used.
diff --git a/docs/Subsystems/README.md b/docs/Subsystems/README.md
@@ -12,10 +12,10 @@ Most modules are optional, see [security considerations](../Usage/Security.md).
 * Server Module: feature implemented by the server, it may interact with multiple "Client Connection Modules"
 
 
-| Subsystem                           | [Client Module](../../xpra/client/mixins/)                   | [Server Module](../../xpra/server/mixins)          | [Client Connection Module](../../xpra/server/source/)    | User Documentation                                      |
-|-------------------------------------|--------------------------------------------------------------|----------------------------------------------------|----------------------------------------------------------|---------------------------------------------------------|
-| [Audio](./Audio.md)                 | [audio](../../xpra/client/mixins/audio.py)                   | [audio](../../xpra/server/mixins/audio.py)         | [audio](../../xpra/server/source/audio.py)               | [audio feature](../Features/Audio.md)                   |
-| [Clipboard](./Clipboard.md)         | [clipboard](../../xpra/client/mixins/clipboard.py)           | [clipboard](../../xpra/server/mixins/clipboard.py) | [clipboard](../../xpra/server/source/clipboard.py)       | [clipboard feature](../Features/Clipboard.md)           |
-| [MMAP](./MMAP.md)                   | [mmap](../../xpra/client/mixins/mmap.py)                     | [mmap](../../xpra/server/mixins/mmap.py)           | [mmap](../../xpra/server/source/mmap.py)                 | enabled automatically                            |
-| [Logging](./Logging.md)             | [remote-logging](../../xpra/client/mixins/remote_logging.py) | [logging](../../xpra/server/mixins/logging.py)     | none                                                     | [logging usage](../Usage/Logging.md)                    |
-| [Notifications](./Notifications.md) | [notifications](../../xpra/client/mixins/notifications.py)  | [logging](../../xpra/server/mixins/notification.py) | [notification](../../xpra/server/source/notification.py) | [notifications feature](../Features/Notifications.md)   |
+| Subsystem                           | [Client Module](../../xpra/client/mixins/)                   | [Server Module](../../xpra/server/mixins)           | [Client Connection Module](../../xpra/server/source/)      | User Documentation                                       |
+|-------------------------------------|--------------------------------------------------------------|-----------------------------------------------------|------------------------------------------------------------|----------------------------------------------------------|
+| [Audio](./Audio.md)                 | [audio](../../xpra/client/mixins/audio.py)                   | [audio](../../xpra/server/mixins/audio.py)          | [audio](../../xpra/server/source/audio.py)                 | [audio feature](../Features/Audio.md)                    |
+| [Clipboard](./Clipboard.md)         | [clipboard](../../xpra/client/mixins/clipboard.py)           | [clipboard](../../xpra/server/mixins/clipboard.py)  | [clipboard](../../xpra/server/source/clipboard.py)         | [clipboard feature](../Features/Clipboard.md)            |
+| [MMAP](./MMAP.md)                   | [mmap](../../xpra/client/mixins/mmap.py)                     | [mmap](../../xpra/server/mixins/mmap.py)            | [mmap](../../xpra/server/source/mmap.py)                   | enabled automatically                                    |
+| [Logging](./Logging.md)             | [remote-logging](../../xpra/client/mixins/logging.py) | [logging](../../xpra/server/mixins/logging.py)      | none                                                       | [logging usage](../Usage/Logging.md)                     |
+| [Notifications](./Notifications.md) | [notifications](../../xpra/client/mixins/notification.py)    | [logging](../../xpra/server/mixins/notification.py) | [notification](../../xpra/server/source/notification.py)   | [notifications feature](../Features/Notifications.md)    |
diff --git a/tests/unittests/unit/client/mixins/notifications_test.py b/tests/unittests/unit/client/mixins/notifications_test.py
@@ -7,7 +7,7 @@
 import unittest
 
 from xpra.util import AdHocStruct
-from xpra.client.mixins.notifications import NotificationClient
+from xpra.client.mixins.notification import NotificationClient
 from unit.client.mixins.clientmixintest_util import ClientMixinTest
 
 

diff --git a/tests/unittests/unit/client/mixins/remotelogging_test.py b/tests/unittests/unit/client/mixins/remotelogging_test.py
@@ -7,7 +7,7 @@
 import unittest
 
 from xpra.util import AdHocStruct
-from xpra.client.mixins import remote_logging
+from xpra.client.mixins import logging
 from unit.test_util import silence_info
 from unit.client.mixins.clientmixintest_util import ClientMixinTest
 

diff --git a/xpra/client/gtk3/gtk_client_base.py b/xpra/client/gtk3/gtk_client_base.py
@@ -260,7 +260,7 @@ def get_notifier_classes(self) -> list[type]:
         #use the native ones first:
         from xpra.client.gui import mixin_features
         assert mixin_features.notifications
-        from xpra.client.mixins.notifications import NotificationClient
+        from xpra.client.mixins.notification import NotificationClient
         assert isinstance(self, NotificationClient)
         ncs = NotificationClient.get_notifier_classes(self)
         try:

diff --git a/xpra/client/gui/ui_client_base.py b/xpra/client/gui/ui_client_base.py
@@ -54,13 +54,13 @@
     from xpra.client.mixins.clipboard import ClipboardClient
     CLIENT_BASES.append(ClipboardClient)
 if mixin_features.notifications:
-    from xpra.client.mixins.notifications import NotificationClient
+    from xpra.client.mixins.notification import NotificationClient
     CLIENT_BASES.append(NotificationClient)
 if mixin_features.mmap:
     from xpra.client.mixins.mmap import MmapClient
     CLIENT_BASES.append(MmapClient)
 if mixin_features.logging:
-    from xpra.client.mixins.remote_logging import RemoteLogging
+    from xpra.client.mixins.logging import RemoteLogging
     CLIENT_BASES.append(RemoteLogging)
 if mixin_features.network_state:
     from xpra.client.mixins.network_state import NetworkState

diff --git a/xpra/client/mixins/notifications.py b/xpra/client/mixins/notifications.py