1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
Description: Fix some deprecated code
Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
Bug-Ubuntu: https://launchpad.net/bugs/1951985
Last-Update: 2021-11-23
---
aptdaemon/client.py | 52 ++++++++++++++++++++++++++--------------------------
aptdaemon/errors.py | 2 +-
aptdaemon/gtk3widgets.py | 6 +++---
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/aptdaemon/client.py b/aptdaemon/client.py
index c9fccd2..db032a3 100644
--- a/aptdaemon/client.py
+++ b/aptdaemon/client.py
@@ -385,10 +385,10 @@ class AptTransaction(GObject.Object):
dependencies before the transaction will be executed.
"""
- __gsignals__ = {"finished": (GObject.SIGNAL_RUN_FIRST,
+ __gsignals__ = {"finished": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_STRING,)),
- "dependencies-changed": (GObject.SIGNAL_RUN_FIRST,
+ "dependencies-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_PYOBJECT,
GObject.TYPE_PYOBJECT,
@@ -397,37 +397,37 @@ class AptTransaction(GObject.Object):
GObject.TYPE_PYOBJECT,
GObject.TYPE_PYOBJECT,
GObject.TYPE_PYOBJECT)),
- "download-changed": (GObject.SIGNAL_RUN_FIRST,
+ "download-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_INT64,)),
- "space-changed": (GObject.SIGNAL_RUN_FIRST,
+ "space-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_INT64,)),
- "error": (GObject.SIGNAL_RUN_FIRST,
+ "error": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_STRING, GObject.TYPE_STRING)),
- "role-changed": (GObject.SIGNAL_RUN_FIRST,
+ "role-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_STRING,)),
- "terminal-attached-changed": (GObject.SIGNAL_RUN_FIRST,
+ "terminal-attached-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_BOOLEAN,)),
- "cancellable-changed": (GObject.SIGNAL_RUN_FIRST,
+ "cancellable-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_BOOLEAN,)),
- "meta-data-changed": (GObject.SIGNAL_RUN_FIRST,
+ "meta-data-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_PYOBJECT,)),
- "status-changed": (GObject.SIGNAL_RUN_FIRST,
+ "status-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_STRING,)),
- "status-details-changed": (GObject.SIGNAL_RUN_FIRST,
+ "status-details-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_STRING,)),
- "progress-changed": (GObject.SIGNAL_RUN_FIRST,
+ "progress-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_INT,)),
- "progress-details-changed": (GObject.SIGNAL_RUN_FIRST,
+ "progress-details-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_INT,
GObject.TYPE_INT,
@@ -435,7 +435,7 @@ class AptTransaction(GObject.Object):
GObject.TYPE_INT64,
GObject.TYPE_INT,
GObject.TYPE_INT64)),
- "progress-download-changed": (GObject.SIGNAL_RUN_FIRST,
+ "progress-download-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_STRING,
GObject.TYPE_STRING,
@@ -443,7 +443,7 @@ class AptTransaction(GObject.Object):
GObject.TYPE_INT64,
GObject.TYPE_INT64,
GObject.TYPE_STRING)),
- "packages-changed": (GObject.SIGNAL_RUN_FIRST,
+ "packages-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_PYOBJECT,
GObject.TYPE_PYOBJECT,
@@ -451,39 +451,39 @@ class AptTransaction(GObject.Object):
GObject.TYPE_PYOBJECT,
GObject.TYPE_PYOBJECT,
GObject.TYPE_PYOBJECT)),
- "unauthenticated-changed": (GObject.SIGNAL_RUN_FIRST,
+ "unauthenticated-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_PYOBJECT,)),
- "paused": (GObject.SIGNAL_RUN_FIRST,
+ "paused": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
()),
- "resumed": (GObject.SIGNAL_RUN_FIRST,
+ "resumed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
()),
- "allow-unauthenticated-changed": (GObject.SIGNAL_RUN_FIRST,
+ "allow-unauthenticated-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_BOOLEAN,)),
"remove-obsoleted-depends-changed": (
- GObject.SIGNAL_RUN_FIRST,
+ GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_BOOLEAN,)),
- "locale-changed": (GObject.SIGNAL_RUN_FIRST,
+ "locale-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_STRING,)),
- "terminal-changed": (GObject.SIGNAL_RUN_FIRST,
+ "terminal-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_STRING,)),
- "debconf-socket-changed": (GObject.SIGNAL_RUN_FIRST,
+ "debconf-socket-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_STRING,)),
- "http-proxy-changed": (GObject.SIGNAL_RUN_FIRST,
+ "http-proxy-changed": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_STRING,)),
- "medium-required": (GObject.SIGNAL_RUN_FIRST,
+ "medium-required": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_STRING,
GObject.TYPE_STRING)),
- "config-file-conflict": (GObject.SIGNAL_RUN_FIRST,
+ "config-file-conflict": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE,
(GObject.TYPE_STRING,
GObject.TYPE_STRING)),
diff --git a/aptdaemon/errors.py b/aptdaemon/errors.py
index 4783179..cd98d6e 100644
--- a/aptdaemon/errors.py
+++ b/aptdaemon/errors.py
@@ -174,7 +174,7 @@ def convert_dbus_exception(func):
This decorator requires introspection to the decorated function. So it
cannot be used on any already decorated method.
"""
- argnames, varargs, kwargs, defaults = inspect.getargspec(func)
+ argnames, varargs, kwargs, defaults = inspect.getfullargspec(func)[:4]
@wraps(func)
def _convert_dbus_exception(*args, **kwargs):
diff --git a/aptdaemon/gtk3widgets.py b/aptdaemon/gtk3widgets.py
index af9faec..5c99c1d 100644
--- a/aptdaemon/gtk3widgets.py
+++ b/aptdaemon/gtk3widgets.py
@@ -562,7 +562,7 @@ class AptProgressDialog(Gtk.Dialog):
features a progress bar, cancel button, status icon and label
"""
- __gsignals__ = {"finished": (GObject.SIGNAL_RUN_FIRST,
+ __gsignals__ = {"finished": (GObject.SignalFlags.RUN_FIRST,
GObject.TYPE_NONE, ())}
def __init__(self, transaction=None, parent=None, terminal=True,
@@ -1086,8 +1086,8 @@ class AptConfigFileConflictDialog(_ExpandableDialog):
return _ExpandableDialog.run(self)
-REGEX_RANGE = "^@@ \-(?P<from_start>[0-9]+)(?:,(?P<from_context>[0-9]+))? " \
- "\+(?P<to_start>[0-9]+)(?:,(?P<to_context>[0-9]+))? @@"
+REGEX_RANGE = "^@@ \\-(?P<from_start>[0-9]+)(?:,(?P<from_context>[0-9]+))? " \
+ "\\+(?P<to_start>[0-9]+)(?:,(?P<to_context>[0-9]+))? @@"
class DiffView(Gtk.TextView):
|
