Apport

Merge ~ubuntu-dev/apport/+git/apport-symptoms:lp2060962 into ~ubuntu-dev/apport/+git/apport-symptoms:main

  1. Git
  2. lp:~ubuntu-dev/apport/+git/apport-symptoms
  3. lp2060962
  4. Merge into main
Proposed by Simon Chopin
Status: Merged
Merged at revision: ace42e29ab7d49c3833daf4c6141cb3e6d93a826
Proposed branch: ~ubuntu-dev/apport/+git/apport-symptoms:lp2060962
Merge into: ~ubuntu-dev/apport/+git/apport-symptoms:main
Diff against target: 109 lines (+19/-12)
4 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
symptoms/_audio_data.py (+6/-6)
symptoms/_audio_mixercontrol.py (+5/-5)
Reviewer Review Type Date Requested Status
Benjamin Drung Pending
Ubuntu Development Team Pending
Review via email: mp+464191@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Benjamin Drung (bdrung) wrote :

Change looks good.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 1fb4a28..b6c7903 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+apport-symptoms (0.25) noble; urgency=medium
7+
8+ * d/control: Fix Vcs field from bzr to git
9+ * Fix a flood of warnings when on Python 3.12 (LP: #2060962)
10+
11+ -- Simon Chopin <schopin@ubuntu.com> Fri, 12 Apr 2024 11:54:26 +0200
12+
13 apport-symptoms (0.24) groovy; urgency=medium
14
15 * Resolve crash when /var/log/installer does not exist. (LP: #1899354)
16diff --git a/debian/control b/debian/control
17index 255f083..44955fe 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -4,7 +4,7 @@ Priority: optional
21 Build-Depends: debhelper (>= 7)
22 Maintainer: Ubuntu Developers <ubuntu-motu@lists.ubuntu.com>
23 Standards-Version: 3.9.3
24-Vcs-Bzr: https://code.launchpad.net/~ubuntu-dev/apport/apport-symptoms
25+Vcs-Git: https://git.launchpad.net/~ubuntu-dev/apport/+git/apport-symptoms
26 Homepage: https://wiki.ubuntu.com/Apport
27
28 Package: apport-symptoms
29diff --git a/symptoms/_audio_data.py b/symptoms/_audio_data.py
30index 8eeccdb..6408e0d 100644
31--- a/symptoms/_audio_data.py
32+++ b/symptoms/_audio_data.py
33@@ -120,7 +120,7 @@ def parse_jacks(alsa_card_index):
34 if m:
35 codecname = m.groups(1)[0]
36
37- m = re.search('Pin Default 0x(.*?): \[(.*?)\] (.*?) at (.*?) (.*)', line)
38+ m = re.search(r'Pin Default 0x(.*?): \[(.*?)\] (.*?) at (.*?) (.*)', line)
39 if m:
40 item = Jack()
41 item.codecname = codecname
42@@ -145,7 +145,7 @@ def parse_alsa_cards():
43 alsacards = []
44 try:
45 for card in open('/proc/asound/cards'):
46- m = re.search(' (\d+) \[(\w+)\s*\]: (.+)', card)
47+ m = re.search(r' (\d+) \[(\w+)\s*\]: (.+)', card)
48 if not m is None:
49 s = SoundCard()
50 s.init_alsa(*tuple(m.groups(1)))
51@@ -159,7 +159,7 @@ def parse_pactl_list(pactlvalues):
52 # Not perfect, but good enough for its purpose
53 result = dict()
54 for line in pactlvalues.splitlines():
55- m = re.match('^(\w+) #(\d+)', line)
56+ m = re.match(r'^(\w+) #(\d+)', line)
57 if m:
58 category = m.groups(1)[0]
59 index = int(m.groups(1)[1])
60@@ -168,18 +168,18 @@ def parse_pactl_list(pactlvalues):
61 curitem = dict()
62 result[category][index] = curitem
63 continue
64- m = re.match('^\t(\w+.*?): (.*)', line)
65+ m = re.match(r'^\t(\w+.*?): (.*)', line)
66 if m:
67 curname = m.groups(1)[0]
68 curvalue = m.groups(1)[1]
69 curitem[curname] = curvalue
70 continue
71- m = re.match('^\t(\w+.*?):', line)
72+ m = re.match(r'^\t(\w+.*?):', line)
73 if m:
74 curname = m.groups(1)[0]
75 curitem[curname] = dict()
76 continue
77- m = re.match('^\t\t(\w+.*?) = "(.*)"', line)
78+ m = re.match(r'^\t\t(\w+.*?) = "(.*)"', line)
79 if m:
80 curpropname = m.groups(1)[0]
81 curpropvalue = m.groups(1)[1]
82diff --git a/symptoms/_audio_mixercontrol.py b/symptoms/_audio_mixercontrol.py
83index e3de8d1..f83d6e7 100644
84--- a/symptoms/_audio_mixercontrol.py
85+++ b/symptoms/_audio_mixercontrol.py
86@@ -26,19 +26,19 @@ class MixerControl:
87 for c in pchan_set:
88 self.pchans[c] = {}
89 s = self.amixer_dict[c]
90- m = re.search("\[([\-0-9.]+)dB\]", s)
91+ m = re.search(r"\[([\-0-9.]+)dB\]", s)
92 if m is None:
93 self.has_dB = False
94 else:
95 self.pchans[c]['dB'] = float(m.group(1))
96- if re.search("\[on\]", s):
97+ if re.search(r"\[on\]", s):
98 self.pchans[c]['muted'] = False
99- if re.search("\[off\]", s):
100+ if re.search(r"\[off\]", s):
101 self.pchans[c]['muted'] = True
102- m = re.search(" ?(\d+) ", s)
103+ m = re.search(r" ?(\d+) ", s)
104 if m is not None:
105 self.pchans[c]['value'] = int(m.group(1))
106- m = re.search("\[([\-0-9.]+)%\]", s)
107+ m = re.search(r"\[([\-0-9.]+)%\]", s)
108 if m is not None:
109 self.pchans[c]['percent'] = float(m.group(1))
110

Subscribers

People subscribed via source and target branches

to all changes: