Gentoo Archives: gentoo-commits

From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/libxcb/files: libxcb-1.9-python-3-exception.patch libxcb-1.9-python-3-iteritems.patch
Date: Wed, 31 Oct 2012 23:43:17
Message-Id: 20121031234300.916B721600@flycatcher.gentoo.org
1 chithanh 12/10/31 23:43:00
2
3 Added: libxcb-1.9-python-3-exception.patch
4 libxcb-1.9-python-3-iteritems.patch
5 Log:
6 Version bump.
7
8 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)
9
10 Revision Changes Path
11 1.1 x11-libs/libxcb/files/libxcb-1.9-python-3-exception.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libxcb/files/libxcb-1.9-python-3-exception.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libxcb/files/libxcb-1.9-python-3-exception.patch?rev=1.1&content-type=text/plain
15
16 Index: libxcb-1.9-python-3-exception.patch
17 ===================================================================
18 Replace except statement with a PEP-3110 compliant one. This fixes a regression
19 introduced by c3deeaf714630531d693a6a902b8dabf791858b1
20 https://bugs.freedesktop.org/show_bug.cgi?id=55690
21 ---
22 src/c_client.py | 2 +-
23 1 files changed, 1 insertions(+), 1 deletions(-)
24
25 diff --git a/src/c_client.py b/src/c_client.py
26 index 9952a09..ec66223 100644
27 --- a/src/c_client.py
28 +++ b/src/c_client.py
29 @@ -2908,7 +2908,7 @@ Refer to the README file in xcb/proto for more info.
30 # Ensure the man subdirectory exists
31 try:
32 os.mkdir('man')
33 -except OSError, e:
34 +except OSError as e:
35 if e.errno != errno.EEXIST:
36 raise
37
38 --
39 1.7.8.6
40
41
42
43 1.1 x11-libs/libxcb/files/libxcb-1.9-python-3-iteritems.patch
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libxcb/files/libxcb-1.9-python-3-iteritems.patch?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libxcb/files/libxcb-1.9-python-3-iteritems.patch?rev=1.1&content-type=text/plain
47
48 Index: libxcb-1.9-python-3-iteritems.patch
49 ===================================================================
50 This fixes a regression introduced by ea71d7d7e3f5d8189b80747678e9ca9a417b1d37
51 https://bugs.freedesktop.org/show_bug.cgi?id=55690
52 ---
53 src/c_client.py | 6 +++---
54 1 files changed, 3 insertions(+), 3 deletions(-)
55
56 diff --git a/src/c_client.py b/src/c_client.py
57 index 27a01b1..9952a09 100644
58 --- a/src/c_client.py
59 +++ b/src/c_client.py
60 @@ -2616,7 +2616,7 @@ def _man_request(self, name, cookie_type, void, aux):
61 (cookie_type, self.c_reply_name, base_func_name))
62 f.write('.SH ERRORS\n')
63 if hasattr(self, "doc") and self.doc:
64 - for errtype, errtext in self.doc.errors.iteritems():
65 + for errtype, errtext in self.doc.errors.items():
66 f.write('.IP \\fI%s\\fP 1i\n' % (_t(('xcb', errtype, 'error'))))
67 errtext = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', errtext)
68 f.write('%s\n' % (errtext))
69 @@ -2634,7 +2634,7 @@ def _man_request(self, name, cookie_type, void, aux):
70 see = ['.BR %s (3)' % 'xcb-requests']
71 if self.doc.example:
72 see.append('.BR %s (3)' % 'xcb-examples')
73 - for seename, seetype in self.doc.see.iteritems():
74 + for seename, seetype in self.doc.see.items():
75 if seetype == 'program':
76 see.append('.BR %s (1)' % seename)
77 elif seetype == 'event':
78 @@ -2764,7 +2764,7 @@ def _man_event(self, name):
79 see = ['.BR %s (3)' % 'xcb_generic_event_t']
80 if self.doc.example:
81 see.append('.BR %s (3)' % 'xcb-examples')
82 - for seename, seetype in self.doc.see.iteritems():
83 + for seename, seetype in self.doc.see.items():
84 if seetype == 'program':
85 see.append('.BR %s (1)' % seename)
86 elif seetype == 'event':
87 --
88 1.7.8.6