[Python-modules-commits] [pyglet] 01/08: unapply patches

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository pyglet.

commit f249f05244161fb47702262cfdee4121ab2c1100
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Dec 14 02:14:58 2015 +0000

    unapply patches
    
    Gbp-Dch: Ignore
---
 pyglet/gl/lib_glx.py             | 2 +-
 pyglet/lib.py                    | 4 +---
 pyglet/window/carbon/__init__.py | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pyglet/gl/lib_glx.py b/pyglet/gl/lib_glx.py
index 35676c2..aa72fb4 100644
--- a/pyglet/gl/lib_glx.py
+++ b/pyglet/gl/lib_glx.py
@@ -56,7 +56,7 @@ try:
     glXGetProcAddressARB.argtypes = [POINTER(c_ubyte)]
     _have_getprocaddress = True
 except AttributeError:
-    _have_getprocaddress = False
+    _have_get_procaddress = False
 
 def link_GL(name, restype, argtypes, requires=None, suggestions=None):
     try:
diff --git a/pyglet/lib.py b/pyglet/lib.py
index 12621c8..d290d8f 100644
--- a/pyglet/lib.py
+++ b/pyglet/lib.py
@@ -96,9 +96,7 @@ class LibraryLoader(object):
             platform_names = list(platform_names)
 
         if self.platform == 'linux2':
-            for name in names:
-                libname = ctypes.util.find_library(name)
-                platform_names.append(libname or 'lib%s.so' % name)
+            platform_names.extend(['lib%s.so' % n for n in names])
 
         platform_names.extend(names)
         for name in platform_names:
diff --git a/pyglet/window/carbon/__init__.py b/pyglet/window/carbon/__init__.py
index 644018a..e5f6e14 100644
--- a/pyglet/window/carbon/__init__.py
+++ b/pyglet/window/carbon/__init__.py
@@ -655,7 +655,7 @@ class CarbonWindow(BaseWindow):
         # Can occur when mixing with other toolkits, e.g. Tk.
         # Fixes issue 180.
         if result not in (eventLoopTimedOutErr, eventLoopQuitErr):
-            raise WindowException('Error %d' % result)
+            raise 'Error %d' % result
 
     def dispatch_pending_events(self):
         while self._event_queue:
@@ -1356,7 +1356,7 @@ def _create_cfstring(text):
 
 def _oscheck(result):
     if result != noErr:
-        raise CarbonException('Carbon error %d' % result)
+        raise 'Carbon error %d' % result
     return result
 
 def _aglcheck():

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyglet.git