Date: Sunday, September 20, 2015 @ 10:31:39
Author: fyan
Revision: 141210
upgpkg: python-xpybutil 0.0.1.20150328-2
update patch to handle exception gracefully
Modified:
python-xpybutil/trunk/PKGBUILD
python-xpybutil/trunk/xcffib-compat.patch
-+
PKGBUILD|4 +-
xcffib-compat.patch | 96 +-
2 files changed, 67 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-09-20 08:29:34 UTC (rev 141209)
+++ PKGBUILD2015-09-20 08:31:39 UTC (rev 141210)
@@ -5,7 +5,7 @@
pkgname=python2-xpybutil
pkgver=0.0.1.20150328
_commit=8ee7dc406aabb3d54f38e692bf068b1b61131d83
-pkgrel=1
+pkgrel=2
pkgdesc="An incomplete xcb-util port plus some extras"
arch=('any')
url="https://github.com/BurntSushi/xpybutil";
@@ -14,7 +14,7 @@
source=("git+https://github.com/BurntSushi/xpybutil.git#commit=$_commit";
xcffib-compat.patch)
md5sums=('SKIP'
- '6623c64e52c5753d759ef3f4ff6a8a87')
+ 'b5bf6cac28a2546152229fcb77599dd5')
prepare() {
cd "$srcdir/xpybutil"
Modified: xcffib-compat.patch
===
--- xcffib-compat.patch 2015-09-20 08:29:34 UTC (rev 141209)
+++ xcffib-compat.patch 2015-09-20 08:31:39 UTC (rev 141210)
@@ -1,8 +1,28 @@
-commit 78424375f3733394f84f8b4b6663f961402951ff
-Author: Felix Yan
-Date: Wed Sep 16 17:13:46 2015 +0800
+From 6e2b96ccb04212096f8faca772ed7dc5a2d20e43 Mon Sep 17 00:00:00 2001
+From: Felix Yan
+Date: Wed, 16 Sep 2015 17:13:46 +0800
+Subject: [PATCH] Add support for xcffib
-Add support for xcffib
+---
+ examples/window-marker.py | 6 +-
+ setup.py | 6 +-
+ xpybutil/__init__.py | 5 +-
+ xpybutil/compat.py| 17 +
+ xpybutil/event.py | 5 +-
+ xpybutil/ewmh.py | 176 +++---
+ xpybutil/font.py | 6 +-
+ xpybutil/icccm.py | 54 +++---
+ xpybutil/image.py | 6 +-
+ xpybutil/keybind.py | 2 +-
+ xpybutil/motif.py | 4 +-
+ xpybutil/mousebind.py | 2 +-
+ xpybutil/rect.py | 4 +-
+ xpybutil/render.py| 12 ++--
+ xpybutil/util.py | 6 +-
+ xpybutil/window.py| 8 +--
+ xpybutil/xinerama.py | 4 +-
+ 17 files changed, 170 insertions(+), 153 deletions(-)
+ create mode 100644 xpybutil/compat.py
diff --git a/examples/window-marker.py b/examples/window-marker.py
index e345656..01f3998 100644
@@ -60,26 +80,27 @@
setup(
diff --git a/xpybutil/__init__.py b/xpybutil/__init__.py
-index 8ec1eda..af58027 100644
+index 8ec1eda..a10886e 100644
--- a/xpybutil/__init__.py
+++ b/xpybutil/__init__.py
-@@ -1,4 +1,4 @@
+@@ -1,9 +1,8 @@
-import xcb, xcb.xproto
-+from xpybutil.compat import xcb
++from xpybutil.compat import xcb, xcb_ConnectException
try:
conn = xcb.connect()
-@@ -6,4 +6,3 @@ try:
- except xcb.ConnectException:
+ root = conn.get_setup().roots[0].root
+-except xcb.ConnectException:
++except xcb_ConnectException:
conn = None
root = None
-
diff --git a/xpybutil/compat.py b/xpybutil/compat.py
new file mode 100644
-index 000..66efa58
+index 000..d06130e
--- /dev/null
+++ b/xpybutil/compat.py
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,17 @@
+try:
+import xcffib as xcb
+import xcffib.xproto as xproto
@@ -86,6 +107,8 @@
+import xcffib.xinerama as xinerama
+import xcffib.randr as randr
+import xcffib.render as render
++from xcffib import XcffibException as xcb_Exception
++from xcffib import ConnectionException as xcb_ConnectException
+
+except ImportError:
+import xcb
@@ -93,25 +116,36 @@
+import xcb.xinerama as xinerama
+import xcb.randr as randr
+import xcb.render as render
++from xcb import Exception as xcb_Exception
++from xcb import ConnectException as xcb_ConnectException
diff --git a/xpybutil/event.py b/xpybutil/event.py
-index c161874..15f636e 100644
+index c161874..06b47db 100644
--- a/xpybutil/event.py
+++ b/xpybutil/event.py
-@@ -8,8 +8,7 @@ import struct
+@@ -8,8 +8,7 @@
import sys
import traceback
-import xcb
-import xcb.xproto as xproto
-+from xpybutil.compat import xcb, xproto
++from xpybutil.compat import xcb_Exception, xproto
from xpybutil import conn, root, util
+@@ -150,7 +149,7 @@ def main():
+ key = (e.__class__, w)
+ for cb in __callbacks.get(key, []):
+ cb(e)
+-except xcb.Exception:
++except xcb_Exception:
+ traceback.print_exc()
+ sys.exit(1)
+
diff --git a/xpybutil/ewmh.py b/xpybutil/ewmh.py
index a4f0977..c101555 100644
--- a/xpybutil/ewmh.py
+++ b/xpybutil/ewmh.py
-@@ -72,7 +72,7 @@ spec :-)
+@@ -72,7 +72,7 @@
"""
import struct
@@ -818,7 +852,7 @@
index 8190620..68b448f 100644
--- a/xpybutil/font.py
+++ b/xpybutil/font.py
