From f89335081628c0675869304c711638664473af5f Mon Sep 17 00:00:00 2001 From: Avasam Date: Fri, 4 Nov 2022 18:02:55 -0400 Subject: [PATCH 1/5] __all__ missing actual imports --- Xlib/__init__.py | 4 +++- Xlib/ext/__init__.py | 9 +++++++-- Xlib/keysymdef/__init__.py | 5 ++++- Xlib/protocol/__init__.py | 4 +++- Xlib/support/__init__.py | 4 +++- Xlib/xobject/__init__.py | 4 +++- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Xlib/__init__.py b/Xlib/__init__.py index 9db8beec..db616ef8 100644 --- a/Xlib/__init__.py +++ b/Xlib/__init__.py @@ -19,6 +19,8 @@ # Suite 330, # Boston, MA 02111-1307 USA +from . import XK, X, Xatom, Xcursorfont, Xutil, display, error, rdb + __version__ = (0, 32) __version_extra__ = '' @@ -36,4 +38,4 @@ 'rdb', # Explicitly exclude threaded, so that it isn't imported by # from Xlib import * - ] +] diff --git a/Xlib/ext/__init__.py b/Xlib/ext/__init__.py index 37229bac..59d48221 100644 --- a/Xlib/ext/__init__.py +++ b/Xlib/ext/__init__.py @@ -23,6 +23,9 @@ # extname is the name of the extension according to the X # protocol. extmod is the name of the module in this package. +from . import (composite, damage, dpms, ge, nvcontrol, randr, record, res, screensaver, security, shape, xfixes, + xinerama, xinput, xtest) + __extensions__ = [ # We load this first so other extensions can register generic event data # structures. @@ -41,6 +44,8 @@ ('DPMS', 'dpms'), ('X-Resource', 'res'), ('MIT-SCREEN-SAVER', 'screensaver'), - ] +] + -__all__ = map(lambda x: x[1], __extensions__) +__all__ = ['ge', 'xtest', 'shape', 'xinerama', 'record', 'composite', 'randr', + 'xfixes', 'security', 'xinput', 'nvcontrol', 'damage', 'dpms', 'res', 'screensaver'] diff --git a/Xlib/keysymdef/__init__.py b/Xlib/keysymdef/__init__.py index 4ff14416..c5bd6f17 100644 --- a/Xlib/keysymdef/__init__.py +++ b/Xlib/keysymdef/__init__.py @@ -19,6 +19,9 @@ # Suite 330, # Boston, MA 02111-1307 USA +from . import (apl, arabic, cyrillic, greek, hebrew, katakana, korean, latin1, latin2, latin3, latin4, miscellany, + publishing, special, technical, thai, xf86, xk3270, xkb) + __all__ = [ 'apl', 'arabic', @@ -39,4 +42,4 @@ 'xf86', 'xk3270', 'xkb', - ] +] diff --git a/Xlib/protocol/__init__.py b/Xlib/protocol/__init__.py index 4e2840a1..5999295e 100644 --- a/Xlib/protocol/__init__.py +++ b/Xlib/protocol/__init__.py @@ -19,10 +19,12 @@ # Suite 330, # Boston, MA 02111-1307 USA +from . import display, event, request, rq, structs + __all__ = [ 'display', 'event', 'request', 'rq', 'structs', - ] +] diff --git a/Xlib/support/__init__.py b/Xlib/support/__init__.py index 4c0d622b..2da8ff29 100644 --- a/Xlib/support/__init__.py +++ b/Xlib/support/__init__.py @@ -19,8 +19,10 @@ # Suite 330, # Boston, MA 02111-1307 USA +from . import connect, lock + __all__ = [ 'lock', 'connect' # The platform specific modules should not be listed here - ] +] diff --git a/Xlib/xobject/__init__.py b/Xlib/xobject/__init__.py index 67d32549..49143b7f 100644 --- a/Xlib/xobject/__init__.py +++ b/Xlib/xobject/__init__.py @@ -19,6 +19,8 @@ # Suite 330, # Boston, MA 02111-1307 USA +from . import colormap, cursor, drawable, fontable, icccm, resource + __all__ = [ 'colormap', 'cursor', @@ -26,4 +28,4 @@ 'fontable', 'icccm', 'resource', - ] +] From 87fd615a9c79d6e769f4b4d00eb4853fc10d5cca Mon Sep 17 00:00:00 2001 From: Avasam Date: Fri, 4 Nov 2022 18:25:37 -0400 Subject: [PATCH 2/5] Fix circular dependency --- Xlib/display.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Xlib/display.py b/Xlib/display.py index e0f7b5c8..3e80d308 100644 --- a/Xlib/display.py +++ b/Xlib/display.py @@ -26,7 +26,6 @@ from six import create_unbound_method # Xlib modules -from . import error from . import ext from . import X @@ -949,3 +948,6 @@ def no_operation(self, onerror = None): """Do nothing but send a request to the server.""" request.NoOperation(display = self.display, onerror = onerror) + +# Late import because of circular dependency +from . import error From 3e02f2d47515ab89e799017fc8c496a5307c1a50 Mon Sep 17 00:00:00 2001 From: Avasam Date: Fri, 4 Nov 2022 18:32:47 -0400 Subject: [PATCH 3/5] Unused import not installed --- Xlib/ext/randr.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Xlib/ext/randr.py b/Xlib/ext/randr.py index 256e3dee..029ef303 100644 --- a/Xlib/ext/randr.py +++ b/Xlib/ext/randr.py @@ -33,8 +33,7 @@ """ - -from tkinter import W +W = "w" from Xlib import X from Xlib.protocol import rq, structs From 74817f4a07043dd2580d4555f574998242c1b173 Mon Sep 17 00:00:00 2001 From: Avasam Date: Fri, 18 Nov 2022 17:02:20 -0500 Subject: [PATCH 4/5] Update Xlib/ext/randr.py --- Xlib/ext/randr.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Xlib/ext/randr.py b/Xlib/ext/randr.py index 029ef303..ea7b193c 100644 --- a/Xlib/ext/randr.py +++ b/Xlib/ext/randr.py @@ -33,7 +33,6 @@ """ -W = "w" from Xlib import X from Xlib.protocol import rq, structs From 92fd325a6a5d850ebd838a9e89287a52f932f619 Mon Sep 17 00:00:00 2001 From: Avasam Date: Tue, 27 Dec 2022 14:44:28 -0500 Subject: [PATCH 5/5] Minimize formatting changes --- Xlib/__init__.py | 2 +- Xlib/ext/__init__.py | 2 +- Xlib/ext/randr.py | 1 + Xlib/keysymdef/__init__.py | 2 +- Xlib/protocol/__init__.py | 2 +- Xlib/support/__init__.py | 2 +- Xlib/xobject/__init__.py | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Xlib/__init__.py b/Xlib/__init__.py index dbfdcb16..090eb3f2 100644 --- a/Xlib/__init__.py +++ b/Xlib/__init__.py @@ -38,4 +38,4 @@ 'rdb', # Explicitly exclude threaded, so that it isn't imported by # from Xlib import * -] + ] diff --git a/Xlib/ext/__init__.py b/Xlib/ext/__init__.py index 59d48221..f1f49d61 100644 --- a/Xlib/ext/__init__.py +++ b/Xlib/ext/__init__.py @@ -44,7 +44,7 @@ ('DPMS', 'dpms'), ('X-Resource', 'res'), ('MIT-SCREEN-SAVER', 'screensaver'), -] + ] __all__ = ['ge', 'xtest', 'shape', 'xinerama', 'record', 'composite', 'randr', diff --git a/Xlib/ext/randr.py b/Xlib/ext/randr.py index 9ffea037..9cbfe2da 100644 --- a/Xlib/ext/randr.py +++ b/Xlib/ext/randr.py @@ -33,6 +33,7 @@ """ + from Xlib import X from Xlib.protocol import rq diff --git a/Xlib/keysymdef/__init__.py b/Xlib/keysymdef/__init__.py index c5bd6f17..ef5e1ee8 100644 --- a/Xlib/keysymdef/__init__.py +++ b/Xlib/keysymdef/__init__.py @@ -42,4 +42,4 @@ 'xf86', 'xk3270', 'xkb', -] + ] diff --git a/Xlib/protocol/__init__.py b/Xlib/protocol/__init__.py index 5999295e..342446c6 100644 --- a/Xlib/protocol/__init__.py +++ b/Xlib/protocol/__init__.py @@ -27,4 +27,4 @@ 'request', 'rq', 'structs', -] + ] diff --git a/Xlib/support/__init__.py b/Xlib/support/__init__.py index 2da8ff29..74174cf5 100644 --- a/Xlib/support/__init__.py +++ b/Xlib/support/__init__.py @@ -25,4 +25,4 @@ 'lock', 'connect' # The platform specific modules should not be listed here -] + ] diff --git a/Xlib/xobject/__init__.py b/Xlib/xobject/__init__.py index 49143b7f..570365e7 100644 --- a/Xlib/xobject/__init__.py +++ b/Xlib/xobject/__init__.py @@ -28,4 +28,4 @@ 'fontable', 'icccm', 'resource', -] + ]