[Python-modules-commits] r15147 - in packages/pyglet/trunk/debian (3 files)

[yoh at users.alioth.debian.org]

    Date: Sunday, December 26, 2010 @ 23:32:36
  Author: yoh
Revision: 15147

up_no_string_exceptions: replace deprecated string exceptions (Closes: #585316)

Added:
  packages/pyglet/trunk/debian/patches/up_no_string_exceptions
Modified:
  packages/pyglet/trunk/debian/changelog
  packages/pyglet/trunk/debian/patches/series

Modified: packages/pyglet/trunk/debian/changelog
===================================================================
--- packages/pyglet/trunk/debian/changelog	2010-12-26 23:32:28 UTC (rev 15146)
+++ packages/pyglet/trunk/debian/changelog	2010-12-26 23:32:36 UTC (rev 15147)
@@ -15,6 +15,10 @@
       original author, part of the project, thus is covered by project's
       copyright/license
   * debian/source/format: switch source format to 3.0 (quilt)
+  * Introduced patches:
+    - up_no_string_exceptions: deduced two types of exceptions appropritate
+      for the context to replace deprecated in 2.6 string exceptions
+      (Closes: #585316)
 
  -- Yaroslav Halchenko <debian at onerussian.com>  Sat, 25 Dec 2010 22:25:44 -0500
 

Modified: packages/pyglet/trunk/debian/patches/series
===================================================================
--- packages/pyglet/trunk/debian/patches/series	2010-12-26 23:32:28 UTC (rev 15146)
+++ packages/pyglet/trunk/debian/patches/series	2010-12-26 23:32:36 UTC (rev 15147)
@@ -0,0 +1 @@
+up_no_string_exceptions

Added: packages/pyglet/trunk/debian/patches/up_no_string_exceptions
===================================================================
--- packages/pyglet/trunk/debian/patches/up_no_string_exceptions	                        (rev 0)
+++ packages/pyglet/trunk/debian/patches/up_no_string_exceptions	2010-12-26 23:32:36 UTC (rev 15147)
@@ -0,0 +1,28 @@
+From: Yaroslav Halchenko <debian at onerussian.com>
+Subject: No strings exceptions is allowed in Python2.6
+
+Types of exceptions were deduced and might be changed by upstream
+whenever patch gets adopted.
+
+Vendor: Debian
+
+--- 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 'Error %d' % result
++            raise WindowException('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 'Carbon error %d' % result
++        raise CarbonException('Carbon error %d' % result)
+     return result
+ 
+ def _aglcheck():