Merge lp:~illume/pgs4a/fixes into lp:pgs4a

[illume]

[Tom Rothamel (renpytom)]

Could you try the Ubuntu version of cython? It seems to support three-argument getattr.

Unmerged revisions

100. By illume on 2011-03-12

Version of pyrex on ubuntu does not support 3 arg gettattr. Made 3rd arg work.

=== modified file 'jni/application/python/start.pyx'
--- jni/application/python/start.pyx	2011-02-21 21:40:39 +0000
+++ jni/application/python/start.pyx	2011-03-12 22:33:06 +0000
@@ -8,6 +8,11 @@
 cdef extern initandroid()
     
 import sys
+def _getattr(o, attr, default):
+    try:
+        return getattr(o, attr)
+    except AttributeError:
+        return default
 
 class LogFile(object):
     def __init__(self):
@@ -52,7 +57,7 @@
 
     import main
 
-    if getattr(main, "main", None):
+    if _getattr(main, "main", None):
         main.main()
 
 except:

=== modified file 'runtimelib/android_sound.pyx'
--- runtimelib/android_sound.pyx	2011-02-19 17:09:14 +0000
+++ runtimelib/android_sound.pyx	2011-03-12 22:33:06 +0000
@@ -15,13 +15,19 @@
 channels = set()
 volumes = { }
 
+def _getattr(o, attr, default):
+    try:
+        return getattr(o, attr)
+    except AttributeError:
+        return default
+
 def queue(channel, file, name, fadein=0, tight=False):
 
     channels.add(channel)
     
     real_fn = file.name    
-    base = getattr(file, "base", -1)
-    length = getattr(file, "length", -1)
+    base = _getattr(file, "base", -1)
+    length = _getattr(file, "length", -1)
 
     android_sound_queue(channel, name, real_fn, base, length)
 
@@ -30,8 +36,8 @@
     channels.add(channel)
     
     real_fn = file.name    
-    base = getattr(file, "base", -1)
-    length = getattr(file, "length", -1)
+    base = _getattr(file, "base", -1)
+    length = _getattr(file, "length", -1)
 
     android_sound_play(channel, name, real_fn, base, length)