Unbreak usage with python 2.6.

(patch from Fedora)
This commit is contained in:
ajacoutot 2010-11-15 18:30:38 +00:00
parent 5aa6807966
commit 23283b6abf
2 changed files with 21 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2010/10/19 08:13:56 espie Exp $
# $OpenBSD: Makefile,v 1.21 2010/11/15 18:30:38 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= mini programs for your desktop
V= 0.36.1
DISTNAME= gdesklets-${V}
REVISION= 8
REVISION= 9
CATEGORIES= x11
@ -32,7 +32,7 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
gtk-x11-2.0 kvm m pango-1.0 pangocairo-1.0 ffi gtop-2.0 \
pangoft2-1.0 pcre pixman-1 png xml2 z pthread-stubs xcb \
gthread-2.0 xcb-render xcb-render-util
gthread-2.0 xcb-render GL Xxf86vm drm xcb-shm
LIB_DEPENDS= ::devel/libgtop2 \
::x11/gnome/librsvg

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-utils_ErrorFormatter_py,v 1.1 2010/11/15 18:30:38 ajacoutot Exp $
Unbreak with python 2.6 (from Fedora).
--- utils/ErrorFormatter.py.orig Thu Mar 20 00:00:59 2008
+++ utils/ErrorFormatter.py Mon Nov 15 19:20:15 2010
@@ -113,9 +113,9 @@ class _ErrorFormatter(object):
# give us an absolute path.
#
_old_imp = __import__
-def _new_imp(name, globs = {}, locls = {}, fromlist = []):
+def _new_imp(*args, **kwargs):
- module = _old_imp(name, globs, locls, fromlist)
+ module = _old_imp(*args, **kwargs)
# builtin modules have no "__file__" attribute, so we have to check for it
if (module):
if (hasattr(module, "__file__")):