- Patch from Johan Cwiklinski <mailings x-tnd.be>

	  to support python 2.6


svn path=/trunk/; revision=3749

4 files changed, 17 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 1a8fc12..9d9998b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-28  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	- Patch from Johan Cwiklinski <mailings x-tnd.be>
+	  to support python 2.6
+
+	* src/boards/python/admin/class_edit.py:
+	* src/boards/python/admin/group_edit.py:
+	* src/boards/python/admin/profile_edit.py:
+
 2009-02-25  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	- Now properly points use images in ~My GCompris/Images
diff --git a/src/boards/python/admin/class_edit.py b/src/boards/python/admin/class_edit.py
index 36ef7d1..166a28e 100644
--- a/src/boards/python/admin/class_edit.py
+++ b/src/boards/python/admin/class_edit.py
@@ -223,10 +223,10 @@ class ClassEdit(gtk.Window):
     # If class_id is provided, only users in this class are inserted
     # If with = True, create a list only with the given class_id.
     #           False, create a list only without the given class_id
-    def __create_model(self, with, class_id):
+    def __create_model(self, _with, class_id):
 
         # Grab the user data
-        if(with):
+        if(_with):
             self.cur.execute('SELECT user_id,firstname,lastname FROM users where class_id=? ORDER BY login', (class_id,))
         else:
             self.cur.execute('SELECT user_id,firstname,lastname FROM users WHERE class_id!=? ORDER BY login', (class_id,))
diff --git a/src/boards/python/admin/group_edit.py b/src/boards/python/admin/group_edit.py
index bd71bfe..92a370b 100644
--- a/src/boards/python/admin/group_edit.py
+++ b/src/boards/python/admin/group_edit.py
@@ -228,7 +228,7 @@ class GroupEdit(gtk.Window):
     # group_id: only users in this group are inserted
     # If with = True,  create a list only with user in the given class_id and group_id.
     #           False, create a list only with user in the given class_id but NOT this group_id
-    def __create_model(self, with, class_id, group_id):
+    def __create_model(self, _with, class_id, group_id):
 
         model = gtk.ListStore(
             gobject.TYPE_INT,
@@ -247,9 +247,9 @@ class GroupEdit(gtk.Window):
                              (group_id, user[0]))
             user_is_already = self.cur.fetchall()
 
-            if(with and user_is_already):
+            if(_with and user_is_already):
                 self.add_user_in_model(model, user)
-            elif(not with and not user_is_already):
+            elif(not _with and not user_is_already):
                 self.add_user_in_model(model, user)
 
 
diff --git a/src/boards/python/admin/profile_edit.py b/src/boards/python/admin/profile_edit.py
index 1b46272..6371efe 100644
--- a/src/boards/python/admin/profile_edit.py
+++ b/src/boards/python/admin/profile_edit.py
@@ -223,7 +223,7 @@ class ProfileEdit(gtk.Window):
     # profile_id: only groups in this profile are inserted
     # If with = True,  create a list only with groups in the given profile_id
     #           False, create a list only with groups NOT this profile_id
-    def __create_model(self, with, profile_id):
+    def __create_model(self, _with, profile_id):
 
         model = gtk.ListStore(
             gobject.TYPE_INT,
@@ -252,9 +252,9 @@ class ProfileEdit(gtk.Window):
             # Insert the class name in the group
             group = (group[0], class_name, group[1], group[2])
 
-            if(with and group_is_already):
+            if(_with and group_is_already):
                 self.add_group_in_model(model, group)
-            elif(not with and not group_is_already):
+            elif(not _with and not group_is_already):
                 self.add_group_in_model(model, group)
 
         return model