Merge lp:~lfaraone/ubuntu/lucid/python-gasp/lp419501 into lp:ubuntu/lucid/python-gasp

[Luke Faraone]

New upstream bugfix release.

=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2010-03-12 14:32:20 +0000
@@ -0,0 +1,3 @@
+include AUTHORS COPYING NEWS
+recursive-include tests *.txt *.py
+recursive-include gasp/images *.png

=== modified file 'NEWS'
--- NEWS	2009-08-21 06:07:16 +0000
+++ NEWS	2010-03-12 14:32:20 +0000
@@ -1,3 +1,17 @@
+python-gasp (0.3.3) stable; urgency=low
+
+  * Work around xlib threadinb bug (LP: #41950) 
+  * Correctly handle pressed keys (LP: #533413)
+
+ -- Luke Faraone <[e-mail]>  Mon, 08 Mar 2010 23:07:06 -0500
+
+python-gasp (0.3.2~win32-1) stable; urgency=low
+
+  * Import gobject.GError instead of glib.GError on Windows or when glib is
+    unavailable.  (NO CHANGE ON OTHER PLATFORMS)
+
+ -- Luke Faraone <[e-mail]>  Fri, 28 Aug 2009 16:29:41 -0400
+
 python-gasp (0.3.2) stable; urgency=low
 
   * No longer raise an exception when removing an object not on the screen,

=== added file 'PKG-INFO'
--- PKG-INFO	1970-01-01 00:00:00 +0000
+++ PKG-INFO	2010-03-12 14:32:20 +0000
@@ -0,0 +1,24 @@
+Metadata-Version: 1.0
+Name: gasp
+Version: 0.3.3
+Summary: GASP provides a simple, procedural graphics API for beginning students using Python
+Home-page: http://wiki.laptop.org/go/GASP
+Author: Luke Faraone
+Author-email: [e-mail]
+License: GPLv3+
+Download-URL: https://launchpad.net/gasp-code/+download
+Description: UNKNOWN
+Keywords: gasp
+Platform: UNKNOWN
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: X11 Applications :: GTK
+Classifier: Environment :: Win32 (MS Windows)
+Classifier: Intended Audience :: Education
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Programming Language :: Python
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Education :: Computer Aided Instruction (CAI)
+Classifier: Topic :: Multimedia :: Graphics
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: User Interfaces

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-10 20:15:49 +0000
+++ debian/changelog	2010-03-12 14:32:20 +0000
@@ -1,3 +1,9 @@
+python-gasp (0.3.3-0ubuntu1) lucid; urgency=low
+
+  * New upstream release. (LP: #419501)
+
+ -- Luke Faraone <[e-mail]>  Fri, 12 Mar 2010 09:19:17 -0500
+
 python-gasp (0.3.2-1ubuntu1) lucid; urgency=low
 
   * Drop dependency on python-multiprocessing, multiprocessing module

=== added directory 'gasp.egg-info'
=== added file 'gasp.egg-info/PKG-INFO'
--- gasp.egg-info/PKG-INFO	1970-01-01 00:00:00 +0000
+++ gasp.egg-info/PKG-INFO	2010-03-12 14:32:20 +0000
@@ -0,0 +1,24 @@
+Metadata-Version: 1.0
+Name: gasp
+Version: 0.3.3
+Summary: GASP provides a simple, procedural graphics API for beginning students using Python
+Home-page: http://wiki.laptop.org/go/GASP
+Author: Luke Faraone
+Author-email: [e-mail]
+License: GPLv3+
+Download-URL: https://launchpad.net/gasp-code/+download
+Description: UNKNOWN
+Keywords: gasp
+Platform: UNKNOWN
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: X11 Applications :: GTK
+Classifier: Environment :: Win32 (MS Windows)
+Classifier: Intended Audience :: Education
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Programming Language :: Python
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Education :: Computer Aided Instruction (CAI)
+Classifier: Topic :: Multimedia :: Graphics
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: User Interfaces

=== added file 'gasp.egg-info/SOURCES.txt'
--- gasp.egg-info/SOURCES.txt	1970-01-01 00:00:00 +0000
+++ gasp.egg-info/SOURCES.txt	2010-03-12 14:32:20 +0000
@@ -0,0 +1,20 @@
+AUTHORS
+COPYING
+MANIFEST.in
+NEWS
+README
+setup.py
+gasp/__init__.py
+gasp/api.py
+gasp/backend.py
+gasp/color.py
+gasp.egg-info/PKG-INFO
+gasp.egg-info/SOURCES.txt
+gasp.egg-info/dependency_links.txt
+gasp.egg-info/requires.txt
+gasp.egg-info/top_level.txt
+gasp/images/gasp.png
+tests/mockbackends.py
+tests/run.py
+tests/test_api.txt
+tests/test_backend.txt
\ No newline at end of file

=== added file 'gasp.egg-info/dependency_links.txt'
--- gasp.egg-info/dependency_links.txt	1970-01-01 00:00:00 +0000
+++ gasp.egg-info/dependency_links.txt	2010-03-12 14:32:20 +0000
@@ -0,0 +1,1 @@
+

=== added file 'gasp.egg-info/requires.txt'
--- gasp.egg-info/requires.txt	1970-01-01 00:00:00 +0000
+++ gasp.egg-info/requires.txt	2010-03-12 14:32:20 +0000
@@ -0,0 +1,4 @@
+setuptools
+pycairo >= 1.4
+pygobject
+pygtk >= 2.0
\ No newline at end of file

=== added file 'gasp.egg-info/top_level.txt'
--- gasp.egg-info/top_level.txt	1970-01-01 00:00:00 +0000
+++ gasp.egg-info/top_level.txt	2010-03-12 14:32:20 +0000
@@ -0,0 +1,1 @@
+gasp

=== modified file 'gasp/backend.py'
--- gasp/backend.py	2009-08-21 06:07:16 +0000
+++ gasp/backend.py	2010-03-12 14:32:20 +0000
@@ -21,14 +21,25 @@
 import sys
 import math
 import multiprocessing
-import threading
+#import threading
 
 import cairo
 import gobject
 import time
-import gtk
-
-from glib import GError
+
+
+try: 
+    from glib import GError
+except ImportError:
+    # must be on windows, then
+    print '[DBG]: On Windows'
+    try:
+        from gobject import GError
+    except ImportError:
+        # TODO: we *should* display a warning
+        # worst case now you'll get a traceback
+        print '[DBG]: No GError in gobject!'
+        GError = None 
 
 # diffrent update_when values
 NOTHING = "Nothing"
@@ -63,69 +74,33 @@
     #create the screen obj
     screen = screen_obj
 
-    #create the window and set its size and title
-    screen.window = gtk.Window()
-    screen.window.set_title(screen.title)
-    screen.window.set_default_size(screen.width, screen.height)
-    screen.window.set_resizable(False)
-
-    #create the drawing area 
-    screen.drawing_area = gtk.DrawingArea()
-    screen.window.add(screen.drawing_area)
-    screen.drawing_area.set_size_request(screen.width,screen.height)
-    screen.drawing_area.show()
-
-    screen.frame_rate = 40
-    screen.last_tick = time.time()
-
-    #set up the event handling
-    screen.drawing_area.set_events( gtk.gdk.EXPOSURE_MASK
-                                | gtk.gdk.BUTTON1_MOTION_MASK
-                                | gtk.gdk.BUTTON_PRESS_MASK
-                                | gtk.gdk.BUTTON_RELEASE_MASK
-                                | gtk.gdk.POINTER_MOTION_MASK
-                                | gtk.gdk.POINTER_MOTION_HINT_MASK)
-    screen.drawing_area.connect("motion_notify_event", mouse_move)
-    screen.drawing_area.connect('button-press-event', mouse_press)
-    screen.drawing_area.connect('button-release-event', mouse_release)
-    screen.window.connect("key-press-event",key_pressed)
-    screen.window.connect("key-release-event",key_released)
-    screen.window.connect('delete-event', quit)
     screen.keys_pressed = []
     screen.mouse_pos = (-1,-1)
     screen.mouse_state = {"left":0,"middle":0,"right":0}
     screen.mouse_buttons = ["left","middle","right"]
-
-    #set the window icon and show the window
-    pic = os.path.join(os.path.join(os.path.dirname(os.path.abspath(__file__)),"images"),"gasp.png")
-    try:
-        screen.window.set_icon_from_file(pic)
-    except GError, e: # in case the file is not found
-        print "Warning: " + e.message
-    screen.window.show()
-
-    #create the buffer to draw to
-    screen.buffer = gtk.gdk.Pixmap(screen.drawing_area.window, screen.width, screen.height)
-    screen.gc = gtk.gdk.GC(screen.buffer)
+    screen.screenshot = False
+    screen.filename = ""
+    screen.update_when = NOTHING
+
+    screen.sprites = 0
+
+    screen.text_entry = None
+    screen.frame_rate = 40
+    screen.last_tick = time.time()
+
+
     screen.objects = []
+    screen.process = multiprocessing.current_process()
+    screen.updater = Updater(screen)
+    #start the thread that will update the gui by calling main_iteration
+
     screen.action_objects = multiprocessing.Queue()
     screen.keys = multiprocessing.Queue()
-    screen.process = multiprocessing.current_process()
-
-    screen.mouse = multiprocessing.Queue()
-
-    #start the thread that will update the gui by calling main_iteration
-    screen.updater = Updater(screen)
-    
-    screen.screenshot = False
-    screen.filename = ""
-    screen.update_when = NOTHING
+    screen.mouse = multiprocessing.Queue()    
     screen.update1 = multiprocessing.Queue()
     screen.update2 = multiprocessing.Queue()
     #if this is called to often key and mouse events will be slow
-    screen.sprites = 0
 
-    screen.text_entry = None
     screen.entry_done = multiprocessing.Queue()
     screen.updater.daemon = True
     screen.updater.start()
@@ -243,6 +218,44 @@
                             i.rot = obj[2]
 
     def run(self):
+        import gtk
+        screen = self.screen
+        #create the window and set its size and title
+        screen.window = gtk.Window()
+        screen.window.set_title(screen.title)
+        screen.window.set_default_size(screen.width, screen.height)
+        screen.window.set_resizable(False)
+
+        #create the drawing area 
+        screen.drawing_area = gtk.DrawingArea()
+        screen.window.add(screen.drawing_area)
+        screen.drawing_area.set_size_request(screen.width,screen.height)
+        screen.drawing_area.show()
+
+        #set up the event handling
+        screen.drawing_area.set_events( gtk.gdk.EXPOSURE_MASK
+                                    | gtk.gdk.BUTTON1_MOTION_MASK
+                                    | gtk.gdk.BUTTON_PRESS_MASK
+                                    | gtk.gdk.BUTTON_RELEASE_MASK
+                                    | gtk.gdk.POINTER_MOTION_MASK
+                                    | gtk.gdk.POINTER_MOTION_HINT_MASK)
+        screen.drawing_area.connect("motion_notify_event", mouse_move)
+        screen.drawing_area.connect('button-press-event', mouse_press)
+        screen.drawing_area.connect('button-release-event', mouse_release)
+        screen.window.connect("key-press-event",key_pressed)
+        screen.window.connect("key-release-event",key_released)
+        screen.window.connect('delete-event', quit)
+
+        #set the window icon and show the window
+        pic = os.path.join(os.path.join(os.path.dirname(os.path.abspath(__file__)),"images"),"gasp.png")
+        try:
+            screen.window.set_icon_from_file(pic)
+        except GError, e: # in case the file is not found
+            print "Warning: " + e.message
+        screen.window.show()
+        #create the buffer to draw to
+        screen.buffer = gtk.gdk.Pixmap(screen.drawing_area.window, screen.width, screen.height)
+        screen.gc = gtk.gdk.GC(screen.buffer)
         gobject.timeout_add(40, self.update) #this will call update periodically
         self.running = True
         #while threading.enumerate()[0].isAlive() and self.running:
@@ -526,7 +539,7 @@
 def keys(): #returns all the keys currently being pressed
     while not screen.keys.empty():
         key = screen.keys.get()
-        if key[1] == "pressed":
+        if key[1] == "pressed" and key[0] not in screen.keys_pressed:
            screen.keys_pressed.append(key[0])
         if key[1] == "released" and key[0] in screen.keys_pressed:
            screen.keys_pressed.remove(key[0])

=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2010-03-12 14:32:20 +0000
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+

=== modified file 'setup.py'
--- setup.py	2009-08-21 06:07:16 +0000
+++ setup.py	2010-03-12 14:32:20 +0000
@@ -18,7 +18,7 @@
 
 setup(
     name = 'gasp',
-    version = '0.3.2',
+    version = '0.3.3',
     packages = ['gasp',
                ],