[Xcb-commit] 2 commits - src

[Uli Schlachter]

 src/c_client.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 76a2166de9c80b35f987fdc3f3a228bafa0de94e
Author: Chí-Thanh Christopher Nguyễn <chithanh at gentoo.org>
Date:   Thu Oct 11 01:14:12 2012 +0200

    c_client.py: Fix python-3 invalid except statement
    
    Replace except statement with a PEP-3110 compliant one. This fixes a regression
    introduced by c3deeaf714630531d693a6a902b8dabf791858b1
    https://bugs.freedesktop.org/show_bug.cgi?id=55690
    
    Reviewed-by: Peter Harris <pharris at opentext.com>
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/c_client.py b/src/c_client.py
index 9952a09..ec66223 100644
--- a/src/c_client.py
+++ b/src/c_client.py
@@ -2908,7 +2908,7 @@ Refer to the README file in xcb/proto for more info.
 # Ensure the man subdirectory exists
 try:
     os.mkdir('man')
-except OSError, e:
+except OSError as e:
     if e.errno != errno.EEXIST:
         raise
 
commit 9db4517c87f56bb0ac82b647a08db30850ee2b04
Author: Chí-Thanh Christopher Nguyễn <chithanh at gentoo.org>
Date:   Thu Oct 11 01:14:11 2012 +0200

    c-client.py: Fix python-3 AttributeError: 'dict' object has no attribute 'iteritems'
    
    This fixes a regression introduced by ea71d7d7e3f5d8189b80747678e9ca9a417b1d37
    https://bugs.freedesktop.org/show_bug.cgi?id=55690
    
    Reviewed-by: Peter Harris <pharris at opentext.com>
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/c_client.py b/src/c_client.py
index 27a01b1..9952a09 100644
--- a/src/c_client.py
+++ b/src/c_client.py
@@ -2616,7 +2616,7 @@ def _man_request(self, name, cookie_type, void, aux):
                 (cookie_type, self.c_reply_name, base_func_name))
     f.write('.SH ERRORS\n')
     if hasattr(self, "doc") and self.doc:
-        for errtype, errtext in self.doc.errors.iteritems():
+        for errtype, errtext in self.doc.errors.items():
             f.write('.IP \\fI%s\\fP 1i\n' % (_t(('xcb', errtype, 'error'))))
             errtext = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', errtext)
             f.write('%s\n' % (errtext))
@@ -2634,7 +2634,7 @@ def _man_request(self, name, cookie_type, void, aux):
         see = ['.BR %s (3)' % 'xcb-requests']
         if self.doc.example:
             see.append('.BR %s (3)' % 'xcb-examples')
-        for seename, seetype in self.doc.see.iteritems():
+        for seename, seetype in self.doc.see.items():
             if seetype == 'program':
                 see.append('.BR %s (1)' % seename)
             elif seetype == 'event':
@@ -2764,7 +2764,7 @@ def _man_event(self, name):
         see = ['.BR %s (3)' % 'xcb_generic_event_t']
         if self.doc.example:
             see.append('.BR %s (3)' % 'xcb-examples')
-        for seename, seetype in self.doc.see.iteritems():
+        for seename, seetype in self.doc.see.items():
             if seetype == 'program':
                 see.append('.BR %s (1)' % seename)
             elif seetype == 'event':