 @@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.5 2011/08/22 12:18:18 wiz Exp $
+$NetBSD: distinfo,v 1.6 2011/09/06 20:45:05 wiz Exp $
 SHA1 (python-xlib-0.14.tar.gz) = e25e3c1284e768d3f84eaebbea4ed3e647c2a05b
 RMD160 (python-xlib-0.14.tar.gz) = be5610035fb1aee36a55e3e276582e3e31ba1cfc
 Size (python-xlib-0.14.tar.gz) = 200223 bytes
 SHA1 (patch-Xlib_____init____.py) = 201d4855b03534204723d88522d6af3529e5bd6c
-SHA1 (patch-Xlib_protocol_display.py) = 02c7f9eb41e0208350451b3f5306b465b64ee986
+SHA1 (patch-Xlib_protocol_display.py) = e6943531a5e2ae1164e5faab2824f8e90b3d2493
-SHA1 (patch-Xlib_protocol_rq.py) = 3ef1926b0afc4f89113308195470e5b52cb31fd0
+SHA1 (patch-Xlib_protocol_rq.py) = 08909f1bf14bc76f61ac186ba980ab44bc8ed3f8
-SHA1 (patch-Xlib_rdb.py) = c4848428f461fe911d6611ede1f5e6bd9e58efa5
+SHA1 (patch-Xlib_rdb.py) = 34e5be7f62577b4eb887288eea4be9a509be9414
-SHA1 (patch-Xlib_support_unix__connect.py) = 5ca41fd48ab26999ffdf0c3dd2fb4c170f1c8bb4
+SHA1 (patch-Xlib_support_unix__connect.py) = 529d31935bf0aee30a628c1b80c6bee6874888d3
-SHA1 (patch-Xlib_support_vms__connect.py) = 573e4cf6028d7edca268f16e0899e59b34373545
+SHA1 (patch-Xlib_support_vms__connect.py) = 8acb059239059f2b943fdc2a20231c7d9f79bb1d
-SHA1 (patch-Xlib_xauth.py) = f4b9518f159200b1ef0681b871ede9b10d3cc3bb
+SHA1 (patch-Xlib_xauth.py) = 6e7444789a17f5e4264ba8a70f1c2ff1bb812850
-SHA1 (patch-Xlib_xobject_cursor.py) = 4a0bcbd8548eec7f1954ea1397a30d833d0c7edd
+SHA1 (patch-Xlib_xobject_cursor.py) = c45c11b4cd5589cdd88c14c8f3029f93fc0bc18f
-SHA1 (patch-Xlib_xobject_drawable.py) = ff0426003b6260273e241fd4062e2130fef942f5
+SHA1 (patch-Xlib_xobject_drawable.py) = 590206bf0d83fa639a871d303c6bf9845ee9bf7f
-SHA1 (patch-Xlib_xobject_fontable.py) = 9c8337e1bd520464e92d3b06e177980402f8bd43
+SHA1 (patch-Xlib_xobject_fontable.py) = 3a6cb416d9a81932657e2bd7db2fc6430d54d766

 @@ -1,16 +1,17 @@
-$NetBSD: patch-Xlib_protocol_display.py,v 1.1 2011/08/22 12:18:19 wiz Exp $
+$NetBSD: patch-Xlib_protocol_display.py,v 1.2 2011/09/06 20:45:05 wiz Exp $
 Python-3.1 compatibility.
 https://sourceforge.net/tracker/?func=detail&aid=3405244&group_id=10350&atid=310350
 --- Xlib/protocol/display.py.orig	2007-06-10 14:11:58.000000000 +0000
 +++ Xlib/protocol/display.py
 @@ -504,7 +504,7 @@ class Display:
              # Ignore errors caused by a signal recieved while blocking.
              # All other errors are re-raised.
 -            except select.error, err:
 +            except select.error as err:
                  if err[0] != errno.EINTR:
                      raise err
 @@ -519,7 +519,7 @@ class Display:

 @@ -1,16 +1,17 @@
-$NetBSD: patch-Xlib_protocol_rq.py,v 1.1 2011/08/22 12:18:19 wiz Exp $
+$NetBSD: patch-Xlib_protocol_rq.py,v 1.2 2011/09/06 20:45:05 wiz Exp $
 Python-3.1 compatibility.
 https://sourceforge.net/tracker/?func=detail&aid=3405244&group_id=10350&atid=310350
 --- Xlib/protocol/rq.py.orig	2007-06-10 14:11:58.000000000 +0000
 +++ Xlib/protocol/rq.py
 @@ -1090,7 +1090,7 @@ class Struct:
          # memory leak isn't that serious.  Besides, Python 2.0 has
          # real garbage collect.
 -        exec code
 +        exec(code)
          self.to_binary = new.instancemethod(to_binary, self, self.__class__)
          # Finally call it manually
 @@ -1175,7 +1175,7 @@ class Struct:

 @@ -1,16 +1,17 @@
-$NetBSD: patch-Xlib_rdb.py,v 1.1 2011/08/22 12:18:19 wiz Exp $
+$NetBSD: patch-Xlib_rdb.py,v 1.2 2011/09/06 20:45:05 wiz Exp $
 Python-3.1 compatibility.
 https://sourceforge.net/tracker/?func=detail&aid=3405244&group_id=10350&atid=310350
 --- Xlib/rdb.py.orig	2007-06-10 14:11:58.000000000 +0000
 +++ Xlib/rdb.py
 @@ -191,12 +191,13 @@ class ResourceDB:
          self.lock.release()
 -    def __getitem__(self, (name, cls)):
 +    def __getitem__(self, nc):
          """db[name, class]
          Return the value matching the resource identified by NAME and
          CLASS.  If no match is found, KeyError is raised.

 @@ -1,15 +1,16 @@
-$NetBSD: patch-Xlib_support_unix__connect.py,v 1.1 2011/08/22 12:18:19 wiz Exp $
+$NetBSD: patch-Xlib_support_unix__connect.py,v 1.2 2011/09/06 20:45:05 wiz Exp $
 Python-3.1 compatibility.
 https://sourceforge.net/tracker/?func=detail&aid=3405244&group_id=10350&atid=310350
 --- Xlib/support/unix_connect.py.orig	2007-06-10 14:11:58.000000000 +0000
 +++ Xlib/support/unix_connect.py
 @@ -75,7 +75,7 @@ def get_socket(dname, host, dno):
          else:
              s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
              s.connect('/tmp/.X11-unix/X%d' % dno)
 -    except socket.error, val:
 +    except socket.error as val:
          raise error.DisplayConnectionError(dname, str(val))
      # Make sure that the connection isn't inherited in child processes

 @@ -1,15 +1,16 @@
-$NetBSD: patch-Xlib_support_vms__connect.py,v 1.1 2011/08/22 12:18:19 wiz Exp $
+$NetBSD: patch-Xlib_support_vms__connect.py,v 1.2 2011/09/06 20:45:05 wiz Exp $
 Python-3.1 compatibility.
 https://sourceforge.net/tracker/?func=detail&aid=3405244&group_id=10350&atid=310350
 --- Xlib/support/vms_connect.py.orig	2007-06-10 14:11:58.000000000 +0000
 +++ Xlib/support/vms_connect.py
 @@ -62,7 +62,7 @@ def get_socket(dname, host, dno):
          s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
          s.connect((host, 6000 + dno))
 -    except socket.error, val:
 +    except socket.error as val:
          raise error.DisplayConnectionError(dname, str(val))
      return s

 @@ -1,16 +1,17 @@
-$NetBSD: patch-Xlib_xauth.py,v 1.1 2011/08/22 12:18:19 wiz Exp $
+$NetBSD: patch-Xlib_xauth.py,v 1.2 2011/09/06 20:45:05 wiz Exp $
 Python-3.1 compatibility.
 https://sourceforge.net/tracker/?func=detail&aid=3405244&group_id=10350&atid=310350
 --- Xlib/xauth.py.orig	2007-06-10 14:11:58.000000000 +0000
 +++ Xlib/xauth.py
 @@ -42,7 +42,7 @@ class Xauthority:
          try:
              raw = open(filename, 'rb').read()
 -        except IOError, err:
 +        except IOError as err:
              raise error.XauthError('~/.Xauthority: %s' % err)
          self.entries = []
 @@ -84,12 +84,12 @@ class Xauthority:

 @@ -1,16 +1,17 @@
-$NetBSD: patch-Xlib_xobject_cursor.py,v 1.1 2011/08/22 12:18:19 wiz Exp $
+$NetBSD: patch-Xlib_xobject_cursor.py,v 1.2 2011/09/06 20:45:05 wiz Exp $
 Python-3.1 compatibility.
 https://sourceforge.net/tracker/?func=detail&aid=3405244&group_id=10350&atid=310350
 --- Xlib/xobject/cursor.py.orig	2007-06-10 14:11:59.000000000 +0000
 +++ Xlib/xobject/cursor.py
 @@ -31,9 +31,9 @@ class Cursor(resource.Resource):
                             cursor = self.id)
          self.display.free_resource_id(self.id)
 -    def recolor(self, (fore_red, fore_green, fore_blue),
 -                (back_red, back_green, back_blue), onerror = None):
+-
 +    def recolor(self, f_rgb, b_rgb, onerror = None):
 +        back_red, back_green, back_blue = b_rgb
 +        fore_red, fore_green, fore_blue = f_rgb

 @@ -1,16 +1,17 @@
-$NetBSD: patch-Xlib_xobject_drawable.py,v 1.1 2011/08/22 12:18:19 wiz Exp $
+$NetBSD: patch-Xlib_xobject_drawable.py,v 1.2 2011/09/06 20:45:05 wiz Exp $
 Python-3.1 compatibility.
 https://sourceforge.net/tracker/?func=detail&aid=3405244&group_id=10350&atid=310350
 --- Xlib/xobject/drawable.py.orig	2007-06-10 14:11:59.000000000 +0000
 +++ Xlib/xobject/drawable.py
 @@ -233,7 +233,7 @@ class Drawable(resource.Resource):
              unit = self.display.info.bitmap_format_scanline_unit
              stride = roundup(width * unit, pad) >> 3
          else:
 -            raise ValueError, 'Unknown data format'
 +            raise ValueError('Unknown data format')
          maxlen = (self.display.info.max_request_length << 2) \
                   - request.PutImage._request.static_size
 @@ -800,9 +800,10 @@ class Pixmap(Drawable):

 @@ -1,16 +1,17 @@
-$NetBSD: patch-Xlib_xobject_fontable.py,v 1.1 2011/08/22 12:18:19 wiz Exp $
+$NetBSD: patch-Xlib_xobject_fontable.py,v 1.2 2011/09/06 20:45:05 wiz Exp $
 Python-3.1 compatibility.
 https://sourceforge.net/tracker/?func=detail&aid=3405244&group_id=10350&atid=310350
 --- Xlib/xobject/fontable.py.orig	2007-06-10 14:11:59.000000000 +0000
 +++ Xlib/xobject/fontable.py
 @@ -87,8 +87,9 @@ class Font(Fontable):
          self.display.free_resource_id(self.id)
      def create_glyph_cursor(self, mask, source_char, mask_char,
 -                            (fore_red, fore_green, fore_blue),
 -                            (back_red, back_green, back_blue)):
 +                            f_rgb, b_rgb):
 +        fore_red, fore_green, fore_blue = f_rgb
 +        back_red, back_green, back_blue = b_rgb