diff --git a/Xlib/ext/randr.py b/Xlib/ext/randr.py index 9cbfe2d..515703b 100644 --- a/Xlib/ext/randr.py +++ b/Xlib/ext/randr.py @@ -36,6 +36,7 @@ from Xlib import X from Xlib.protocol import rq +from Xlib.error import XError extname = 'RANDR' @@ -123,11 +124,11 @@ BadRRMode = 2 # Error classes # -class BadRROutputError(Exception): pass +class BadRROutputError(XError): pass -class BadRRCrtcError(Exception): pass +class BadRRCrtcError(XError): pass -class BadRRModeError(Exception): pass +class BadRRModeError(XError): pass # Data Structures # diff --git a/setup.py b/setup.py index 71bdb08..1ef3152 100644 --- a/setup.py +++ b/setup.py @@ -1,17 +1,9 @@ # Distutils script for python-xlib -from pkg_resources import parse_requirements -from setuptools import (__version__ as setuptools_version, setup) - - -# Check setuptools is recent enough to support `setup.cfg`. -setuptools_require = next(parse_requirements('setuptools>=30.3.0')) -assert setuptools_version in setuptools_require, '{} is required'.format(setuptools_require) - +from setuptools import setup setup( install_requires=['six>=1.10.0'], - setup_requires=['setuptools-scm'], packages=[ 'Xlib', 'Xlib.ext',