David Baucum has proposed merging lp:~maxolasersquad/xdiagnose/xdiagnose into
lp:xdiagnose.
Requested reviews:
Ubuntu-X (ubuntu-x-swat)
For more details, see:
https://code.launchpad.net/~maxolasersquad/xdiagnose/xdiagnose/+merge/475527
Should fix bug 2083754
--
Your team Ubuntu-X is requested to review the proposed merge of
lp:~maxolasersquad/xdiagnose/xdiagnose into lp:xdiagnose.
=== modified file 'xdiagnose/applet.py'
--- xdiagnose/applet.py 2013-01-18 01:34:39 +0000
+++ xdiagnose/applet.py 2024-10-21 13:23:42 +0000
@@ -184,7 +184,7 @@
d = config_dict(self.__grub_config_filename)
self.kparams = {}
if 'GRUB_CMDLINE_LINUX_DEFAULT' in d:
- re_kparam = re.compile("^([\w\.]+)=(.*)")
+ re_kparam = re.compile(r"^([\w\.]+)=(.*)")
kparam_str = d['GRUB_CMDLINE_LINUX_DEFAULT'].replace('"', '')
for param in kparam_str.split(' '):
value = 1
@@ -194,7 +194,7 @@
value = m.group(2)
self.kparams[param] = value
if 'GRUB_GFXPAYLOAD_LINUX' in d:
- re_kparam = re.compile("^([\w\.]+)=(.*)")
+ re_kparam = re.compile(r"^([\w\.]+)=(.*)")
value = d['GRUB_GFXPAYLOAD_LINUX'].replace('"', '')
self.__grub_gfxpayload_linux = value
if value == 'text':
@@ -323,9 +323,9 @@
process.communicate()
def on_scan_errors(self, widget):
- re_xorg_error = re.compile("^\[\s*([\d\.]+)\] \(EE\) (.*)$")
- re_dmesg_error = re.compile("^\[\s*(\d+\.\d+)\] (.*(?:BUG|ERROR|WARNING).*)$")
- re_jockey_error = re.compile("^(\d+\-\d+-\d+ \d+:\d+:\d+,\d+) ERROR: (.*)$")
+ re_xorg_error = re.compile(r"^\[\s*([\d\.]+)\] \(EE\) (.*)$")
+ re_dmesg_error = re.compile(r"^\[\s*(\d+\.\d+)\] (.*(?:BUG|ERROR|WARNING).*)$")
+ re_jockey_error = re.compile(r"^(\d+\-\d+-\d+ \d+:\d+:\d+,\d+) ERROR: (.*)$")
errors = []
# Xorg.0.log errors
=== modified file 'xdiagnose/config_update.py'
--- xdiagnose/config_update.py 2013-01-18 02:36:00 +0000
+++ xdiagnose/config_update.py 2024-10-21 13:23:42 +0000
@@ -104,7 +104,7 @@
return new_path
def config_dict(filename, delim='='):
- re_param = re.compile("^\s*(\w+)\s*"+delim+"\s*(.*)")
+ re_param = re.compile(r"^\s*(\w+)\s*"+delim+r"\s*(.*)")
data = {}
for line in fileinput.input(filename):
m = re_param.match(line)
@@ -132,7 +132,7 @@
dbg("Merging parameters")
for key in merge_params:
dbg(" - %s" %(key))
- p = re.compile("^\s*"+key+"\s*"+delim+"\s*(\"?)(.*)(\"?)")
+ p = re.compile(r"^\s*"+key+r"\s*"+delim+r"\s*(\"?)(.*)(\"?)")
m = p.match(line)
if m:
value = merge_params[key].replace('"', '')
@@ -144,7 +144,7 @@
dbg("Overriding parameters")
for key in list(override_params.keys()):
dbg(" - %s" %(key))
- p = re.compile("^\s*"+key+"\s*"+delim)
+ p = re.compile(r"^\s*"+key+r"\s*"+delim)
if p.match(line):
new_line = "%s%s%s\n" %(key, delim, override_params[key])
dbg(" delim: %s" %(delim))
@@ -174,7 +174,7 @@
}
merge_params = {
'GRUB_CMDLINE_LINUX_DEFAULT': '"vesafb.invalid=1"',
- 'BAR': 'f(1&&2*$i^2) # \o/',
+ 'BAR': 'f(1&&2*$i^2) # \\o/',
'BOTH': '"incorrect"',
}
=== modified file 'xdiagnose/edid.py'
--- xdiagnose/edid.py 2013-05-08 19:24:47 +0000
+++ xdiagnose/edid.py 2024-10-21 13:23:42 +0000
@@ -66,8 +66,8 @@
# Next, assume it's an Xorg.0.log
raw_edid = ""
- re_head = re.compile("\(II\) .*\(\d+\): EDID \(in hex\):$")
- re_edid = re.compile("\(II\) .*\(\d+\):\s\t([0-9a-f]{32})$")
+ re_head = re.compile(r"\(II\) .*\(\d+\): EDID \(in hex\):$")
+ re_edid = re.compile(r"\(II\) .*\(\d+\):\s\t([0-9a-f]{32})$")
seen_edid_header = False
edid_raw = ""
@@ -283,7 +283,7 @@
if __name__ == "__main__":
edidfile = sys.argv[1]
- regex = re.compile("\(II\) .*\(\d+\):\s+(.*)$")
+ regex = re.compile(r"\(II\) .*\(\d+\):\s+(.*)$")
edid_text = ""
lines = load_file(edidfile)
=== modified file 'xdiagnose/pci_devices.py'
--- xdiagnose/pci_devices.py 2013-01-25 20:03:40 +0000
+++ xdiagnose/pci_devices.py 2024-10-21 13:23:42 +0000
@@ -80,113 +80,113 @@
# References:
# http://en.wikipedia.org/wiki/Intel_GMA
# Driver source code
- PciDevice('i740', '(8086:7800)', [], gen='i740', opengl='1.1', supported=False ),
- PciDevice('i810', '(8086:7121)', [], gen='i810', opengl='1.2', supported=False ),
- PciDevice('i810dc100', '(8086:7123)', [], gen='i810', opengl='1.2', supported=False ),
- PciDevice('i810e', '(8086:7125)', [], gen='i810', opengl='1.2', supported=False ),
- PciDevice('i815', '(8086:1132|82815)', [], gen='i810', opengl='1.2', supported=False ),
- PciDevice('i830m', '(8086:3577|82830)', [INTEL], gen='i830', opengl='1.3', supported=False ),
- PciDevice('i845g', '(8086:2562|82845G)', [INTEL], gen='i830', opengl='1.3', supported=False ),
- PciDevice('i854', '(8086:358e)', [INTEL], gen='i855', opengl='1.3', supported=False ),
- PciDevice('i855g', '(8086:2572)', [INTEL], gen='i855', opengl='1.3', supported=False ),
- PciDevice('i855g', '(8086:3582|855GM)', [INTEL], gen='i855', opengl='1.3', supported=False ),
- PciDevice('i865g', '(8086:2572|82865G)', [INTEL], gen='i855', opengl='1.3', supported=False ),
- PciDevice('i915g', '(8086:2582)', [INTEL], gen='i915', opengl='1.4' ),
- PciDevice('i915g', '(8086:2782)', [INTEL], gen='i915', opengl='1.4' ),
- PciDevice('i915gm', '(8086:2592|915GM)', [INTEL], gen='i915', opengl='1.4' ),
- PciDevice('i915gm', '(8086:2792|915GM)', [INTEL], gen='i915', opengl='1.4' ),
- PciDevice('e7221', '(8086:258a)', [INTEL], opengl=None, supported=False ),
- PciDevice('i945g', '(8086:2772|945G[ \/])', [INTEL], gen='i945', opengl='1.4' ),
- PciDevice('i945g', '(8086:2776)', [INTEL], gen='i945', opengl='1.4' ),
- PciDevice('i945gm', '(8086:27a2|945GM[ \/])', [INTEL], gen='i945', opengl='1.4' ),
- PciDevice('i945gme', '(8086:27a6)', [INTEL], gen='i945', opengl='1.4' ),
- PciDevice('i945gme', '(8086:27ae|945GME)', [INTEL], gen='i945', opengl='1.4' ),
- PciDevice('pineview_g', '(8086:a001)', [INTEL], gen='pineview', opengl='2.0' ),
- PciDevice('pineview_g', '(8086:a002)', [INTEL], gen='pineview', opengl='2.0' ),
- PciDevice('pineview_m', '(8086:a011)', [INTEL], gen='pineview', opengl='2.0' ),
- PciDevice('pineview_m', '(8086:a012)', [INTEL], gen='pineview', opengl='2.0' ),
- PciDevice('i946gz', '(8086:2972|82946GZ)', [INTEL], opengl='1.4' ),
- PciDevice('g35_g', '(8086:2982|82G35)', [INTEL], gen='i965', opengl='2.0' ),
- PciDevice('g35_g', '(8086:2983)', [INTEL], gen='i965', opengl='2.0' ),
- PciDevice('i965q', '(8086:2992|Q965)', [INTEL], gen='i965', opengl='1.4' ),
- PciDevice('i965g', '(8086:29a2|G965)', [INTEL], gen='i965', opengl='2.0' ),
- PciDevice('i965g', '(8086:29a3|G965)', [INTEL], gen='i965', opengl='2.0' ),
- PciDevice('q35', '(8086:29b2)', [INTEL], gen='bearlake', opengl='1.5' ),
- PciDevice('q35', '(8086:29b3)', [INTEL], gen='bearlake', opengl='1.5' ),
- PciDevice('g33', '(8086:29c2|82G33)', [INTEL], gen='bearlake', opengl='1.5' ),
- PciDevice('g33', '(8086:29c3)', [INTEL], gen='bearlake', opengl='1.5' ),
- PciDevice('q33', '(8086:29d2)', [INTEL], gen='bearlake', opengl='1.5' ),
- PciDevice('q33', '(8086:29d3)', [INTEL], gen='bearlake', opengl='1.5' ),
- PciDevice('i965gm', '(8086:2a02|GM965)', [INTEL], gen='i965', opengl='2.1' ),
- PciDevice('i965gm', '(8086:2a03)', [INTEL], gen='i965', opengl='2.1' ),
- PciDevice('i965gme', '(8086:2a12)', [INTEL], gen='i965', opengl='2.1' ),
- PciDevice('i965gme', '(8086:2a13)', [INTEL], gen='i965', opengl='2.1' ),
- PciDevice('gm45_gm', '(8086:2a42)', [INTEL], gen='cantiga', opengl='2.1' ),
- PciDevice('gm45_gm', '(8086:2a43)', [INTEL], gen='cantiga', opengl='2.1' ),
- PciDevice('g45_e_g', '(8086:2e02)', [INTEL], opengl='2.1' ),
- PciDevice('q43', '(8086:2e12)', [INTEL], gen='eaglelake', opengl='2.1' ),
- PciDevice('q45', '(8086:2e13)', [INTEL], gen='eaglelake', opengl='2.1' ),
- PciDevice('g45', '(8086:2e22)', [INTEL], gen='eaglelake', opengl='2.1' ),
- PciDevice('g45', '(8086:2e23)', [INTEL], gen='eaglelake', opengl='2.1' ),
- PciDevice('g41', '(8086:2e32)', [INTEL], gen='eaglelake', opengl='2.1' ),
- PciDevice('g41', '(8086:2e33)', [INTEL], gen='eaglelake', opengl='2.1' ),
- PciDevice('b43', '(8086:2e42)', [INTEL], gen='eaglelake', opengl='2.1' ),
- PciDevice('b43', '(8086:2e43)', [INTEL], gen='eaglelake', opengl='2.1' ),
- PciDevice('b43g1', '(8086:2e92)', [INTEL], gen='eaglelake', opengl='2.1' ),
- PciDevice('b43', '(8086:2e93)', [INTEL], gen='eaglelake', opengl='2.1' ),
- PciDevice('ironlake DG','(8086:0042)', [INTEL], gen='clarkdale', opengl='2.1' ),
- PciDevice('ironlake MG','(8086:0046)', [INTEL], gen='arrandale', opengl='2.1' ),
- PciDevice('snb-gt1', '(8086:0102)', [INTEL], gen='sandybridge', opengl='3.0' ),
- PciDevice('snb-m-gt1', '(8086:0106)', [INTEL], gen='sandybridge', opengl='3.0' ),
- PciDevice('snb-s', '(8086:010a)', [INTEL], gen='sandybridge', opengl='3.0' ),
- PciDevice('snb-gt2', '(8086:0112)', [INTEL], gen='sandybridge', opengl='3.0' ),
- PciDevice('snb-m-gt2', '(8086:0116)', [INTEL], gen='sandybridge', opengl='3.0' ),
- PciDevice('snb-gt2+', '(8086:0122)', [INTEL], gen='sandybridge', opengl='3.0' ),
- PciDevice('snb-m-gt2+', '(8086:0126)', [INTEL], gen='sandybridge', opengl='3.0' ),
- PciDevice('ivb', '(8086:0080)', [INTEL], gen='ivybridge', opengl='3.1' ),
- PciDevice('ivb-m-gt1', '(8086:0156)', [INTEL], gen='ivybridge', opengl='4.0' ),
- PciDevice('ivb-m-gt2', '(8086:0166)', [INTEL], gen='ivybridge', opengl='4.0' ),
- PciDevice('ivb-d-gt1', '(8086:0152)', [INTEL], gen='ivybridge', opengl='4.0' ),
- PciDevice('ivb-d-gt2', '(8086:0162)', [INTEL], gen='ivybridge', opengl='4.0' ),
- PciDevice('ivb-s-gt1', '(8086:015a)', [INTEL], gen='ivybridge', opengl='4.0' ),
- PciDevice('ivb-s-gt1', '(8086:016a)', [INTEL], gen='ivybridge', opengl='4.0' ),
- PciDevice('hsw_d_gt1', '(8086:0402)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_d_gt2', '(8086:0412)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_d_gt2+', '(8086:0422)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_m_gt1', '(8086:0406)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_m_gt2', '(8086:0416)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_m_gt2+', '(8086:0426)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_s_gt1', '(8086:040a)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_s_gt2', '(8086:041a)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_s_gt2+', '(8086:042a)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_sdv_d_gt1', '(8086:0c02)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_sdv_d_gt2', '(8086:0c12)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_sdv_d_gt2+', '(8086:0c22)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_sdv_m_gt1', '(8086:0c06)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_sdv_m_gt2', '(8086:0c16)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_sdv_m_gt2+', '(8086:0c26)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_sdv_s_gt1', '(8086:0c0a)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_sdv_s_gt2', '(8086:0c1a)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_sdv_s_gt2+', '(8086:0c2a)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_ult_d_gt1', '(8086:0a02)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_ult_d_gt2', '(8086:0a12)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_ult_d_gt2+', '(8086:0a22)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_ult_m_gt1', '(8086:0a06)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_ult_m_gt2', '(8086:0a16)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_ult_m_gt2+', '(8086:0a26)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_ult_s_gt1', '(8086:0a0a)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_ult_s_gt2', '(8086:0a1a)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_ult_s_gt2+', '(8086:0a2a)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_crw_d_gt1', '(8086:0d12)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_crw_d_gt2', '(8086:0d22)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_crw_d_gt2+', '(8086:0d32)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_crw_m_gt1', '(8086:0d16)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_crw_m_gt2', '(8086:0d26)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_crw_m_gt2+', '(8086:0d36)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_crw_s_gt1', '(8086:0d1a)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_crw_s_gt2', '(8086:0d2a)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('hsw_crw_s_gt2+', '(8086:0d3a)', [INTEL], gen='haswell', opengl='3.2' ),
- PciDevice('vlv_po', '(8086:0f30)', [INTEL], gen='', opengl='' ),
+ PciDevice('i740', '(8086:7800)', [], gen='i740', opengl='1.1', supported=False ),
+ PciDevice('i810', '(8086:7121)', [], gen='i810', opengl='1.2', supported=False ),
+ PciDevice('i810dc100', '(8086:7123)', [], gen='i810', opengl='1.2', supported=False ),
+ PciDevice('i810e', '(8086:7125)', [], gen='i810', opengl='1.2', supported=False ),
+ PciDevice('i815', '(8086:1132|82815)', [], gen='i810', opengl='1.2', supported=False ),
+ PciDevice('i830m', '(8086:3577|82830)', [INTEL], gen='i830', opengl='1.3', supported=False ),
+ PciDevice('i845g', '(8086:2562|82845G)', [INTEL], gen='i830', opengl='1.3', supported=False ),
+ PciDevice('i854', '(8086:358e)', [INTEL], gen='i855', opengl='1.3', supported=False ),
+ PciDevice('i855g', '(8086:2572)', [INTEL], gen='i855', opengl='1.3', supported=False ),
+ PciDevice('i855g', '(8086:3582|855GM)', [INTEL], gen='i855', opengl='1.3', supported=False ),
+ PciDevice('i865g', '(8086:2572|82865G)', [INTEL], gen='i855', opengl='1.3', supported=False ),
+ PciDevice('i915g', '(8086:2582)', [INTEL], gen='i915', opengl='1.4' ),
+ PciDevice('i915g', '(8086:2782)', [INTEL], gen='i915', opengl='1.4' ),
+ PciDevice('i915gm', '(8086:2592|915GM)', [INTEL], gen='i915', opengl='1.4' ),
+ PciDevice('i915gm', '(8086:2792|915GM)', [INTEL], gen='i915', opengl='1.4' ),
+ PciDevice('e7221', '(8086:258a)', [INTEL], opengl=None, supported=False ),
+ PciDevice('i945g', '(8086:2772|945G[ \\/])', [INTEL], gen='i945', opengl='1.4' ),
+ PciDevice('i945g', '(8086:2776)', [INTEL], gen='i945', opengl='1.4' ),
+ PciDevice('i945gm', '(8086:27a2|945GM[ \\/])', [INTEL], gen='i945', opengl='1.4' ),
+ PciDevice('i945gme', '(8086:27a6)', [INTEL], gen='i945', opengl='1.4' ),
+ PciDevice('i945gme', '(8086:27ae|945GME)', [INTEL], gen='i945', opengl='1.4' ),
+ PciDevice('pineview_g', '(8086:a001)', [INTEL], gen='pineview', opengl='2.0' ),
+ PciDevice('pineview_g', '(8086:a002)', [INTEL], gen='pineview', opengl='2.0' ),
+ PciDevice('pineview_m', '(8086:a011)', [INTEL], gen='pineview', opengl='2.0' ),
+ PciDevice('pineview_m', '(8086:a012)', [INTEL], gen='pineview', opengl='2.0' ),
+ PciDevice('i946gz', '(8086:2972|82946GZ)', [INTEL], opengl='1.4' ),
+ PciDevice('g35_g', '(8086:2982|82G35)', [INTEL], gen='i965', opengl='2.0' ),
+ PciDevice('g35_g', '(8086:2983)', [INTEL], gen='i965', opengl='2.0' ),
+ PciDevice('i965q', '(8086:2992|Q965)', [INTEL], gen='i965', opengl='1.4' ),
+ PciDevice('i965g', '(8086:29a2|G965)', [INTEL], gen='i965', opengl='2.0' ),
+ PciDevice('i965g', '(8086:29a3|G965)', [INTEL], gen='i965', opengl='2.0' ),
+ PciDevice('q35', '(8086:29b2)', [INTEL], gen='bearlake', opengl='1.5' ),
+ PciDevice('q35', '(8086:29b3)', [INTEL], gen='bearlake', opengl='1.5' ),
+ PciDevice('g33', '(8086:29c2|82G33)', [INTEL], gen='bearlake', opengl='1.5' ),
+ PciDevice('g33', '(8086:29c3)', [INTEL], gen='bearlake', opengl='1.5' ),
+ PciDevice('q33', '(8086:29d2)', [INTEL], gen='bearlake', opengl='1.5' ),
+ PciDevice('q33', '(8086:29d3)', [INTEL], gen='bearlake', opengl='1.5' ),
+ PciDevice('i965gm', '(8086:2a02|GM965)', [INTEL], gen='i965', opengl='2.1' ),
+ PciDevice('i965gm', '(8086:2a03)', [INTEL], gen='i965', opengl='2.1' ),
+ PciDevice('i965gme', '(8086:2a12)', [INTEL], gen='i965', opengl='2.1' ),
+ PciDevice('i965gme', '(8086:2a13)', [INTEL], gen='i965', opengl='2.1' ),
+ PciDevice('gm45_gm', '(8086:2a42)', [INTEL], gen='cantiga', opengl='2.1' ),
+ PciDevice('gm45_gm', '(8086:2a43)', [INTEL], gen='cantiga', opengl='2.1' ),
+ PciDevice('g45_e_g', '(8086:2e02)', [INTEL], opengl='2.1' ),
+ PciDevice('q43', '(8086:2e12)', [INTEL], gen='eaglelake', opengl='2.1' ),
+ PciDevice('q45', '(8086:2e13)', [INTEL], gen='eaglelake', opengl='2.1' ),
+ PciDevice('g45', '(8086:2e22)', [INTEL], gen='eaglelake', opengl='2.1' ),
+ PciDevice('g45', '(8086:2e23)', [INTEL], gen='eaglelake', opengl='2.1' ),
+ PciDevice('g41', '(8086:2e32)', [INTEL], gen='eaglelake', opengl='2.1' ),
+ PciDevice('g41', '(8086:2e33)', [INTEL], gen='eaglelake', opengl='2.1' ),
+ PciDevice('b43', '(8086:2e42)', [INTEL], gen='eaglelake', opengl='2.1' ),
+ PciDevice('b43', '(8086:2e43)', [INTEL], gen='eaglelake', opengl='2.1' ),
+ PciDevice('b43g1', '(8086:2e92)', [INTEL], gen='eaglelake', opengl='2.1' ),
+ PciDevice('b43', '(8086:2e93)', [INTEL], gen='eaglelake', opengl='2.1' ),
+ PciDevice('ironlake DG','(8086:0042)', [INTEL], gen='clarkdale', opengl='2.1' ),
+ PciDevice('ironlake MG','(8086:0046)', [INTEL], gen='arrandale', opengl='2.1' ),
+ PciDevice('snb-gt1', '(8086:0102)', [INTEL], gen='sandybridge', opengl='3.0' ),
+ PciDevice('snb-m-gt1', '(8086:0106)', [INTEL], gen='sandybridge', opengl='3.0' ),
+ PciDevice('snb-s', '(8086:010a)', [INTEL], gen='sandybridge', opengl='3.0' ),
+ PciDevice('snb-gt2', '(8086:0112)', [INTEL], gen='sandybridge', opengl='3.0' ),
+ PciDevice('snb-m-gt2', '(8086:0116)', [INTEL], gen='sandybridge', opengl='3.0' ),
+ PciDevice('snb-gt2+', '(8086:0122)', [INTEL], gen='sandybridge', opengl='3.0' ),
+ PciDevice('snb-m-gt2+', '(8086:0126)', [INTEL], gen='sandybridge', opengl='3.0' ),
+ PciDevice('ivb', '(8086:0080)', [INTEL], gen='ivybridge', opengl='3.1' ),
+ PciDevice('ivb-m-gt1', '(8086:0156)', [INTEL], gen='ivybridge', opengl='4.0' ),
+ PciDevice('ivb-m-gt2', '(8086:0166)', [INTEL], gen='ivybridge', opengl='4.0' ),
+ PciDevice('ivb-d-gt1', '(8086:0152)', [INTEL], gen='ivybridge', opengl='4.0' ),
+ PciDevice('ivb-d-gt2', '(8086:0162)', [INTEL], gen='ivybridge', opengl='4.0' ),
+ PciDevice('ivb-s-gt1', '(8086:015a)', [INTEL], gen='ivybridge', opengl='4.0' ),
+ PciDevice('ivb-s-gt1', '(8086:016a)', [INTEL], gen='ivybridge', opengl='4.0' ),
+ PciDevice('hsw_d_gt1', '(8086:0402)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_d_gt2', '(8086:0412)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_d_gt2+', '(8086:0422)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_m_gt1', '(8086:0406)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_m_gt2', '(8086:0416)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_m_gt2+', '(8086:0426)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_s_gt1', '(8086:040a)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_s_gt2', '(8086:041a)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_s_gt2+', '(8086:042a)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_sdv_d_gt1', '(8086:0c02)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_sdv_d_gt2', '(8086:0c12)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_sdv_d_gt2+', '(8086:0c22)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_sdv_m_gt1', '(8086:0c06)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_sdv_m_gt2', '(8086:0c16)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_sdv_m_gt2+', '(8086:0c26)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_sdv_s_gt1', '(8086:0c0a)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_sdv_s_gt2', '(8086:0c1a)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_sdv_s_gt2+', '(8086:0c2a)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_ult_d_gt1', '(8086:0a02)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_ult_d_gt2', '(8086:0a12)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_ult_d_gt2+', '(8086:0a22)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_ult_m_gt1', '(8086:0a06)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_ult_m_gt2', '(8086:0a16)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_ult_m_gt2+', '(8086:0a26)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_ult_s_gt1', '(8086:0a0a)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_ult_s_gt2', '(8086:0a1a)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_ult_s_gt2+', '(8086:0a2a)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_crw_d_gt1', '(8086:0d12)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_crw_d_gt2', '(8086:0d22)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_crw_d_gt2+', '(8086:0d32)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_crw_m_gt1', '(8086:0d16)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_crw_m_gt2', '(8086:0d26)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_crw_m_gt2+', '(8086:0d36)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_crw_s_gt1', '(8086:0d1a)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_crw_s_gt2', '(8086:0d2a)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('hsw_crw_s_gt2+', '(8086:0d3a)', [INTEL], gen='haswell', opengl='3.2' ),
+ PciDevice('vlv_po', '(8086:0f30)', [INTEL], gen='', opengl='' ),
# Poulsbo
#
=== modified file 'xdiagnose/utils/config.py'
--- xdiagnose/utils/config.py 2013-01-05 03:50:53 +0000
+++ xdiagnose/utils/config.py 2024-10-21 13:23:42 +0000
@@ -13,7 +13,7 @@
return "Invalid configuration: %s" %(self.item)
class Config(object):
- '''Yet another INI-style config file parser.
+ r'''Yet another INI-style config file parser.
Assumes a "key = value" style file, with # anywhere on line to
indicate a comment.
=== modified file 'xdiagnose/xorglog.py'
--- xdiagnose/xorglog.py 2012-08-16 00:55:44 +0000
+++ xdiagnose/xorglog.py 2024-10-21 13:23:42 +0000
@@ -93,7 +93,7 @@
gathering_module = False
module = None
- m = re.search('\(II\) Loading.*modules\/drivers\/(.+)_drv\.so', line)
+ m = re.search(r'\(II\) Loading.*modules\/drivers\/(.+)_drv\.so', line)
if m:
found_ddx = True
_______________________________________________
Mailing list: https://launchpad.net/~ubuntu-x-swat
Post to : [email protected]
Unsubscribe : https://launchpad.net/~ubuntu-x-swat
More help : https://help.launchpad.net/ListHelp
