From c9a4dad31b70b9a008a8013354c88308717faa18 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Wed, 10 Mar 2010 11:22:57 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:sugar/mainline

---
(limited to 'src/jarabe')

diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index 43f0fe9..a04922b 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -52,7 +52,6 @@ from jarabe.model.network import Settings
 from jarabe.model.network import IP4Config
 from jarabe.model.network import WirelessSecurity
 from jarabe.model.network import AccessPoint
-from jarabe.model.network import OlpcMesh as OlpcMeshSettings
 from jarabe.model.olpcmesh import OlpcMeshManager
 
 _NM_SERVICE = 'org.freedesktop.NetworkManager'
diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py
index 62519df..fc9ddeb 100644
--- a/src/jarabe/desktop/schoolserver.py
+++ b/src/jarabe/desktop/schoolserver.py
@@ -19,7 +19,7 @@ from gettext import gettext as _
 from xmlrpclib import ServerProxy, Error
 import socket
 import os
-import string
+from string import ascii_uppercase
 import random
 import time
 import uuid
@@ -37,8 +37,8 @@ def generate_serial_number():
 
     serial_part1 = []
 
-    for y in range(3) :
-        serial_part1.append(random.choice(string.ascii_uppercase))
+    for y_ in range(3) :
+        serial_part1.append(random.choice(ascii_uppercase))
 
     serial_part1 = ''.join(serial_part1)
     serial_part2 = str(int(time.time()))[-8:]
@@ -89,7 +89,8 @@ def register_laptop(url=REGISTER_URL):
     else:
         sn = generate_serial_number()
         uuid_ = str(uuid.uuid1())
-        jabber_server = client.get_string('/desktop/sugar/collaboration/jabber_server')
+        setting_name = '/desktop/sugar/collaboration/jabber_server'
+        jabber_server = client.get_string(setting_name)
         store_identifiers(sn, uuid_, jabber_server)
         url = 'http://' + jabber_server + ':8080/'
 
diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
index e73b717..c8e40c1 100644
--- a/src/jarabe/journal/expandedentry.py
+++ b/src/jarabe/journal/expandedentry.py
@@ -28,7 +28,6 @@ import simplejson
 from sugar.graphics import style
 from sugar.graphics.icon import CanvasIcon
 from sugar.graphics.xocolor import XoColor
-from sugar.graphics.entry import CanvasEntry
 from sugar.graphics.canvastextview import CanvasTextView
 from sugar.util import format_size
 
diff --git a/src/jarabe/journal/listmodel.py b/src/jarabe/journal/listmodel.py
index d3b7e24..07f8544 100644
--- a/src/jarabe/journal/listmodel.py
+++ b/src/jarabe/journal/listmodel.py
@@ -103,8 +103,8 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource):
     def on_get_column_type(self, index):
         return ListModel._COLUMN_TYPES[index]
 
-    def on_iter_n_children(self, iter):
-        if iter == None:
+    def on_iter_n_children(self, iterator):
+        if iterator == None:
             return self._result_set.length
         else:
             return 0
@@ -148,7 +148,7 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource):
         else:
             buddies = []
 
-        for n in xrange(0, 3):
+        for n_ in xrange(0, 3):
             if buddies:
                 nick, color = buddies.pop(0)
                 self._cached_row.append((nick, XoColor(color)))
@@ -157,32 +157,32 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource):
 
         return self._cached_row[column]
 
-    def on_iter_nth_child(self, iter, n):
+    def on_iter_nth_child(self, iterator, n):
         return n
 
-    def on_get_path(self, iter):
-        return (iter)
+    def on_get_path(self, iterator):
+        return (iterator)
 
     def on_get_iter(self, path):
         return path[0]
 
-    def on_iter_next(self, iter):
-        if iter != None:
-            if iter >= self._result_set.length - 1:
+    def on_iter_next(self, iterator):
+        if iterator != None:
+            if iterator >= self._result_set.length - 1:
                 return None
-            return iter + 1
+            return iterator + 1
         return None
 
     def on_get_flags(self):
         return gtk.TREE_MODEL_ITERS_PERSIST | gtk.TREE_MODEL_LIST_ONLY
 
-    def on_iter_children(self, iter):
+    def on_iter_children(self, iterator):
         return None
 
-    def on_iter_has_child(self, iter):
+    def on_iter_has_child(self, iterator):
         return False
 
-    def on_iter_parent(self, iter):
+    def on_iter_parent(self, iterator):
         return None
 
     def do_drag_data_get(self, path, selection):
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
index 3c72992..ffc62e0 100644
--- a/src/jarabe/journal/model.py
+++ b/src/jarabe/journal/model.py
@@ -378,9 +378,6 @@ def find(query_, page_size):
     """
     query = query_.copy()
 
-    if 'order_by' not in query:
-        query['order_by'] = ['-mtime']
-
     mount_points = query.pop('mountpoints', ['/'])
     if mount_points is None or len(mount_points) != 1:
         raise ValueError('Exactly one mount point must be specified')
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index 01017fc..0e7702d 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -220,8 +220,8 @@ class StartWithMenu(gtk.Menu):
     def __item_activate_cb(self, menu_item, service_name):
         mime_type = self._metadata.get('mime_type', '')
         if mime_type:
-            mime = mimeregistry.get_registry()
-            mime.set_default_activity(mime_type, service_name)
+            mime_registry = mimeregistry.get_registry()
+            mime_registry.set_default_activity(mime_type, service_name)
         misc.resume(self._metadata, service_name)
 
 
diff --git a/src/jarabe/model/session.py b/src/jarabe/model/session.py
index 121db28..9e0f087 100644
--- a/src/jarabe/model/session.py
+++ b/src/jarabe/model/session.py
@@ -55,7 +55,7 @@ class SessionManager(session.SessionManager):
                 bus = dbus.SystemBus()
                 proxy = bus.get_object('org.freedesktop.Hal',
                                        '/org/freedesktop/Hal/devices/computer')
-                pm = dbus.Interface(proxy, \
+                pm = dbus.Interface(proxy,
                                     'org.freedesktop.Hal.Device.SystemPowerManagement')
 
                 if self._logout_mode == self.MODE_SHUTDOWN:
diff --git a/src/jarabe/util/emulator.py b/src/jarabe/util/emulator.py
index c00f1db..607d840 100644
--- a/src/jarabe/util/emulator.py
+++ b/src/jarabe/util/emulator.py
@@ -15,7 +15,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import os
-import random
 import signal
 import subprocess
 import time
diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py
index 19a56bb..8c07975 100644
--- a/src/jarabe/view/keyhandler.py
+++ b/src/jarabe/view/keyhandler.py
@@ -19,7 +19,6 @@ import os
 import logging
 import traceback
 
-import gconf
 import dbus
 import gtk
 
diff --git a/src/jarabe/view/service.py b/src/jarabe/view/service.py
index 2b91437..fbcc961 100644
--- a/src/jarabe/view/service.py
+++ b/src/jarabe/view/service.py
@@ -15,7 +15,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 """D-bus service providing access to the shell's functionality"""
-import os
 
 import dbus
 import gtk
diff --git a/src/jarabe/view/tabbinghandler.py b/src/jarabe/view/tabbinghandler.py
index c268684..f52bda3 100644
--- a/src/jarabe/view/tabbinghandler.py
+++ b/src/jarabe/view/tabbinghandler.py
@@ -15,7 +15,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import logging
-import time
 
 import gobject
 import gtk
--
cgit v0.9.1