Hi,
two more patches for pylint. One thing that I have not solved yet in the
lint_intro patch is the problem that pylint is not aware of members of
the window class. I think that is the case because the gtk.gdk.window is
only available when the window is realized.
- window xid: shell/intro/glive.py
- Class 'window' has no 'xid' member
- other examples: set_type_hint, set_accept_focus...
Another issue I have quite often is the one of unused variables due to
returned tuples and lists where not all the variables are used in the code.
examaple from src/view/frame/clipboardpanelwindow.py:
scheme, netloc, path, parameters, query, fragment = urlparse.urlparse(uri)
on_disk = (scheme == 'file')
What about doing here, or any other options?
scheme = urlparse.urlparse(uri)[0]
Best,
Simon
diff --git a/src/intro/colorpicker.py b/src/intro/colorpicker.py
index 90dbc26..a939857 100644
--- a/src/intro/colorpicker.py
+++ b/src/intro/colorpicker.py
@@ -24,6 +24,7 @@ class ColorPicker(hippo.CanvasBox, hippo.CanvasItem):
def __init__(self, **kwargs):
hippo.CanvasBox.__init__(self, **kwargs)
self.props.orientation = hippo.ORIENTATION_HORIZONTAL
+ self._xo_color = None
self._xo = CanvasIcon(size=style.XLARGE_ICON_SIZE,
icon_name='computer-xo')
diff --git a/src/intro/glive.py b/src/intro/glive.py
index a875e48..a2ddbae 100644
--- a/src/intro/glive.py
+++ b/src/intro/glive.py
@@ -4,7 +4,6 @@
import gtk
import pygtk
pygtk.require('2.0')
-import sys
import pygst
pygst.require('0.10')
@@ -16,8 +15,12 @@ gobject.threads_init()
class Glive(gobject.GObject):
__gsignals__ = {
- 'new-picture': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
- 'sink': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT]))
+ 'new-picture': (gobject.SIGNAL_RUN_FIRST,
+ gobject.TYPE_NONE,
+ ([gobject.TYPE_PYOBJECT])),
+ 'sink' : (gobject.SIGNAL_RUN_FIRST,
+ gobject.TYPE_NONE,
+ ([gobject.TYPE_PYOBJECT]))
}
def __init__(self, parent, width, height):
@@ -55,7 +58,8 @@ class Glive(gobject.GObject):
self.queue.set_property("max-size-buffers", 1)
self.qsrc = self.queue.get_pad( "src" )
self.qsink = self.queue.get_pad("sink")
- self.ffmpeg = gst.element_factory_make("ffmpegcolorspace", "ffmpegcolorspace")
+ self.ffmpeg = gst.element_factory_make( \
+ "ffmpegcolorspace", "ffmpegcolorspace")
self.jpgenc = gst.element_factory_make("jpegenc", "jpegenc")
self.filesink = gst.element_factory_make("fakesink", "fakesink")
self.filesink.connect( "handoff", self.copyframe )
@@ -74,13 +78,13 @@ class Glive(gobject.GObject):
self._CONNECT_MSG = -1
self.doPostBusStuff()
- def copyframe(self, fsink, buffer, pad, user_data=None):
+ def copyframe(self, fsink, buf, pad, user_data=None):
#for some reason, we get two back to back buffers, even though we
#ask for only one.
if (self.exposureOpen):
self.exposureOpen = False
piccy = gtk.gdk.pixbuf_loader_new_with_mime_type("image/jpeg")
- piccy.write( buffer )
+ piccy.write(buf)
piccy.close()
pixbuf = piccy.get_pixbuf()
del piccy
@@ -103,7 +107,8 @@ class Glive(gobject.GObject):
def doPostBusStuff(self):
self._bus.enable_sync_message_emission()
self._bus.add_signal_watch()
- self._CONNECT_SYNC = self._bus.connect('sync-message::element', self.on_sync_message)
+ self._CONNECT_SYNC = self._bus.connect('sync-message::element',
+ self.on_sync_message)
self._CONNECT_MSG = self._bus.connect('message', self.on_message)
def on_sync_message(self, bus, message):
@@ -116,14 +121,11 @@ class Glive(gobject.GObject):
def on_message(self, bus, message):
t = message.type
if (t == gst.MESSAGE_ERROR):
- err, debug = message.parse_error()
if (self.on_eos):
self.on_eos()
- self._playing = False
elif (t == gst.MESSAGE_EOS):
if (self.on_eos):
self.on_eos()
- self._playing = False
def on_eos( self ):
pass
@@ -140,7 +142,9 @@ class Glive(gobject.GObject):
class LiveVideoSlot(gtk.EventBox):
__gsignals__ = {
- 'pixbuf': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
+ 'pixbuf': (gobject.SIGNAL_RUN_FIRST,
+ gobject.TYPE_NONE,
+ ([gobject.TYPE_PYOBJECT]))
}
def __init__(self, width, height):
diff --git a/src/intro/intro.py b/src/intro/intro.py
index b8c7a10..18092c3 100644
--- a/src/intro/intro.py
+++ b/src/intro/intro.py
@@ -15,12 +15,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import os
-from ConfigParser import ConfigParser
from gettext import gettext as _
import gtk
import gobject
-import dbus
import hippo
import logging
@@ -127,6 +125,7 @@ class _IntroBox(hippo.CanvasBox):
self._name_page = _NamePage(self)
self._color_page = _ColorPage()
self._current_page = None
+ self._next_button = None
self._setup_page()
@@ -208,15 +207,6 @@ class _IntroBox(hippo.CanvasBox):
self.emit('done', pixbuf, name, color)
- def _key_press_cb(self, widget, event):
- if gtk.gdk.keyval_name(event.keyval) == "Return":
- self.next()
- return True
- elif gtk.gdk.keyval_name(event.keyval) == "Escape":
- self.back()
- return True
- return False
-
class IntroWindow(gtk.Window):
def __init__(self):
gtk.Window.__init__(self)
@@ -228,7 +218,7 @@ class IntroWindow(gtk.Window):
self.add(self._canvas)
self._canvas.show()
- self.connect('key-press-event', self._intro_box._key_press_cb)
+ self.connect('key-press-event', self.__key_press_cb)
def _done_cb(self, box, pixbuf, name, color):
self.hide()
@@ -237,7 +227,6 @@ class IntroWindow(gtk.Window):
def _create_profile(self, pixbuf, name, color):
# Save the buddy icon
icon_path = os.path.join(env.get_profile_path(), "buddy-icon.jpg")
- scaled = pixbuf.scale_simple(200, 200, gtk.gdk.INTERP_BILINEAR)
pixbuf.save(icon_path, "jpeg", {"quality":"85"})
profile = get_profile()
@@ -252,13 +241,22 @@ class IntroWindow(gtk.Window):
cmd = "ssh-keygen -q -t dsa -f %s -C '' -N ''" % keypath
(s, o) = commands.getstatusoutput(cmd)
if s != 0:
- logging.error("Could not generate key pair: %d" % s)
+ logging.error("Could not generate key pair: %d %s" % (s, o))
else:
logging.error("Keypair exists, skip generation.")
gtk.main_quit()
return False
+ def __key_press_cb(self, widget, event):
+ if gtk.gdk.keyval_name(event.keyval) == "Return":
+ self._intro_box.next()
+ return True
+ elif gtk.gdk.keyval_name(event.keyval) == "Escape":
+ self._intro_box.back()
+ return True
+ return False
+
if __name__ == "__main__":
w = IntroWindow()
diff --git a/src/model/BuddyModel.py b/src/model/BuddyModel.py
index c989aa7..b51b808 100644
--- a/src/model/BuddyModel.py
+++ b/src/model/BuddyModel.py
@@ -14,8 +14,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-import logging
-
from sugar.presence import presenceservice
from sugar.graphics.xocolor import XoColor
import gobject
@@ -24,16 +22,22 @@ _NOT_PRESENT_COLOR = "#d5d5d5,#FFFFFF"
class BuddyModel(gobject.GObject):
__gsignals__ = {
- 'appeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
- 'disappeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
- 'nick-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
- ([gobject.TYPE_PYOBJECT])),
- 'color-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
- ([gobject.TYPE_PYOBJECT])),
- 'icon-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
- ([])),
- 'current-activity-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
- ([gobject.TYPE_PYOBJECT]))
+ 'appeared': (gobject.SIGNAL_RUN_FIRST,
+ gobject.TYPE_NONE, ([])),
+ 'disappeared': (gobject.SIGNAL_RUN_FIRST,
+ gobject.TYPE_NONE, ([])),
+ 'nick-changed': (gobject.SIGNAL_RUN_FIRST,
+ gobject.TYPE_NONE,
+ ([gobject.TYPE_PYOBJECT])),
+ 'color-changed': (gobject.SIGNAL_RUN_FIRST,
+ gobject.TYPE_NONE,
+ ([gobject.TYPE_PYOBJECT])),
+ 'icon-changed': (gobject.SIGNAL_RUN_FIRST,
+ gobject.TYPE_NONE,
+ ([])),
+ 'current-activity-changed': (gobject.SIGNAL_RUN_FIRST,
+ gobject.TYPE_NONE,
+ ([gobject.TYPE_PYOBJECT]))
}
def __init__(self, key=None, buddy=None, nick=None):
@@ -42,6 +46,7 @@ class BuddyModel(gobject.GObject):
gobject.GObject.__init__(self)
+ self._color = None
self._ba_handler = None
self._pc_handler = None
self._dis_handler = None
@@ -66,9 +71,9 @@ class BuddyModel(gobject.GObject):
else:
self._update_buddy(buddy)
- def _get_buddies_cb(self, list):
+ def _get_buddies_cb(self, buddy_list):
buddy = None
- for iter_buddy in list:
+ for iter_buddy in buddy_list:
if iter_buddy.props.key == self._key:
buddy = iter_buddy
break
@@ -121,8 +126,10 @@ class BuddyModel(gobject.GObject):
self._nick = self._buddy.props.nick
self._set_color_from_string(self._buddy.props.color)
- self._pc_handler = self._buddy.connect('property-changed', self._buddy_property_changed_cb)
- self._bic_handler = self._buddy.connect('icon-changed', self._buddy_icon_changed_cb)
+ self._pc_handler = self._buddy.connect('property-changed',
+ self._buddy_property_changed_cb)
+ self._bic_handler = self._buddy.connect('icon-changed',
+ self._buddy_icon_changed_cb)
def _buddy_appeared_cb(self, pservice, buddy):
if self._buddy or buddy.props.key != self._key:
diff --git a/src/model/MeshModel.py b/src/model/MeshModel.py
index da5b3c2..fa33035 100644
--- a/src/model/MeshModel.py
+++ b/src/model/MeshModel.py
@@ -26,8 +26,8 @@ from hardware import hardwaremanager
from hardware import nmclient
class ActivityModel:
- def __init__(self, activity, bundle):
- self.activity = activity
+ def __init__(self, act, bundle):
+ self.activity = act
self.bundle = bundle
def get_id(self):
@@ -62,7 +62,8 @@ class MeshModel(gobject.GObject):
gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
'mesh-added': (gobject.SIGNAL_RUN_FIRST,
gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
- 'mesh-removed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([]))
+ 'mesh-removed': (gobject.SIGNAL_RUN_FIRST,
+ gobject.TYPE_NONE, ([]))
}
def __init__(self):
@@ -86,7 +87,8 @@ class MeshModel(gobject.GObject):
# Add any buddies the PS knows about already
self._pservice.get_buddies_async(reply_handler=self._get_buddies_cb)
- self._pservice.get_activities_async(reply_handler=self._get_activities_cb)
+ self._pservice.get_activities_async(
+ reply_handler=self._get_activities_cb)
network_manager = hardwaremanager.get_network_manager()
if network_manager:
@@ -97,13 +99,13 @@ class MeshModel(gobject.GObject):
network_manager.connect('device-removed',
self._nm_device_removed_cb)
- def _get_buddies_cb(self, list):
- for buddy in list:
+ def _get_buddies_cb(self, buddy_list):
+ for buddy in buddy_list:
self._buddy_appeared_cb(self._pservice, buddy)
- def _get_activities_cb(self, list):
- for activity in list:
- self._check_activity(activity)
+ def _get_activities_cb(self, activity_list):
+ for act in activity_list:
+ self._check_activity(act)
def _nm_device_added_cb(self, manager, nm_device):
self._add_network_device(nm_device)
@@ -195,8 +197,8 @@ class MeshModel(gobject.GObject):
self.emit('buddy-removed', self._buddies[buddy.props.key])
del self._buddies[buddy.props.key]
- def _activity_appeared_cb(self, pservice, activity):
- self._check_activity(activity)
+ def _activity_appeared_cb(self, pservice, act):
+ self._check_activity(act)
def _check_activity(self, presence_activity):
registry = activity.get_registry()
@@ -216,8 +218,8 @@ class MeshModel(gobject.GObject):
else:
return None
- def add_activity(self, bundle, activity):
- model = ActivityModel(activity, bundle)
+ def add_activity(self, bundle, act):
+ model = ActivityModel(act, bundle)
self._activities[model.get_id()] = model
self.emit('activity-added', model)
@@ -228,8 +230,8 @@ class MeshModel(gobject.GObject):
buddy_model = self._buddies[key]
self.emit('buddy-moved', buddy_model, model)
- def _activity_disappeared_cb(self, pservice, activity):
- if self._activities.has_key(activity.props.id):
- activity_model = self._activities[activity.props.id]
+ def _activity_disappeared_cb(self, pservice, act):
+ if self._activities.has_key(act.props.id):
+ activity_model = self._activities[act.props.id]
self.emit('activity-removed', activity_model)
- del self._activities[activity.props.id]
+ del self._activities[act.props.id]
diff --git a/src/model/Owner.py b/src/model/Owner.py
index b06b391..1447267 100644
--- a/src/model/Owner.py
+++ b/src/model/Owner.py
@@ -16,11 +16,6 @@
import gobject
import os
-import random
-import base64
-import time
-import logging
-import dbus
from sugar import env
from sugar import profile
@@ -29,20 +24,21 @@ from sugar import util
from model.Invites import Invites
class ShellOwner(gobject.GObject):
+ """Class representing the owner of this machine/instance. This class
+ runs in the shell and serves up the buddy icon and other stuff. It's the
+ server portion of the Owner, paired with the client portion in Buddy.py.
+ """
__gtype_name__ = "ShellOwner"
__gsignals__ = {
- 'nick-changed' : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
- ([gobject.TYPE_STRING])),
- 'color-changed' : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
- ([gobject.TYPE_PYOBJECT])),
- 'icon-changed' : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
- ([gobject.TYPE_PYOBJECT]))
+ 'nick-changed' : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+ ([gobject.TYPE_STRING])),
+ 'color-changed' : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+ ([gobject.TYPE_PYOBJECT])),
+ 'icon-changed' : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+ ([gobject.TYPE_PYOBJECT]))
}
- """Class representing the owner of this machine/instance. This class
- runs in the shell and serves up the buddy icon and other stuff. It's the
- server portion of the Owner, paired with the client portion in Buddy.py."""
def __init__(self):
gobject.GObject.__init__(self)
diff --git a/src/model/accesspointmodel.py b/src/model/accesspointmodel.py
index 1d4d6cb..f464f75 100644
--- a/src/model/accesspointmodel.py
+++ b/src/model/accesspointmodel.py
@@ -15,7 +15,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import gobject
-import sys
from hardware import nmclient
diff --git a/src/model/devices/device.py b/src/model/devices/device.py
index d7105b5..3273da9 100644
--- a/src/model/devices/device.py
+++ b/src/model/devices/device.py
@@ -24,7 +24,7 @@ STATE_ACTIVATING = 0
STATE_ACTIVATED = 1
STATE_INACTIVE = 2
-_nm_state_to_state = {
+nm_state_to_state = {
nmclient.DEVICE_STATE_ACTIVATING : STATE_ACTIVATING,
nmclient.DEVICE_STATE_ACTIVATED : STATE_ACTIVATED,
nmclient.DEVICE_STATE_INACTIVE : STATE_INACTIVE
diff --git a/src/model/devices/devicesmodel.py b/src/model/devices/devicesmodel.py
index fab9fa4..691e19e 100644
--- a/src/model/devices/devicesmodel.py
+++ b/src/model/devices/devicesmodel.py
@@ -20,7 +20,6 @@ import gobject
import dbus
from model.devices import device
-from model.devices.network import wired
from model.devices.network import wireless
from model.devices.network import mesh
from model.devices import battery
@@ -60,8 +59,8 @@ class DevicesModel(gobject.GObject):
if not network_manager:
return
- for device in network_manager.get_devices():
- self._check_network_device(device)
+ for dev in network_manager.get_devices():
+ self._check_network_device(dev)
network_manager.connect('device-added',
self._network_device_added_cb)
@@ -114,23 +113,25 @@ class DevicesModel(gobject.GObject):
if dtype == nmclient.DEVICE_TYPE_802_11_WIRELESS:
dev = wireless.Device(nm_device)
self.add_device(dev)
- sigid = dev.connect('notify::state', self._network_device_state_changed_cb)
+ sigid = dev.connect('notify::state',
+ self._network_device_state_changed_cb)
self._sigids[dev] = sigid
if dtype == nmclient.DEVICE_TYPE_802_11_MESH_OLPC:
dev = mesh.Device(nm_device)
self.add_device(dev)
- sigid = dev.connect('notify::state', self._network_device_state_changed_cb)
+ sigid = dev.connect('notify::state',
+ self._network_device_state_changed_cb)
self._sigids[dev] = sigid
def __iter__(self):
return iter(self._devices.values())
- def add_device(self, device):
- self._devices[device.get_id()] = device
- self.emit('device-appeared', device)
+ def add_device(self, dev):
+ self._devices[dev.get_id()] = dev
+ self.emit('device-appeared', dev)
- def remove_device(self, device):
- self.emit('device-disappeared', self._devices[device.get_id()])
- device.disconnect(self._sigids[device])
- del self._sigids[device]
- del self._devices[device.get_id()]
+ def remove_device(self, dev):
+ self.emit('device-disappeared', self._devices[dev.get_id()])
+ dev.disconnect(self._sigids[dev])
+ del self._sigids[dev]
+ del self._devices[dev.get_id()]
diff --git a/src/model/devices/network/mesh.py b/src/model/devices/network/mesh.py
index 0152d8a..36626e6 100644
--- a/src/model/devices/network/mesh.py
+++ b/src/model/devices/network/mesh.py
@@ -18,7 +18,6 @@
import gobject
from model.devices import device
-from hardware import nmclient
class Device(device.Device):
__gproperties__ = {
@@ -56,7 +55,7 @@ class Device(device.Device):
return self._nm_device.get_strength()
elif pspec.name == 'state':
nm_state = self._nm_device.get_state()
- return device._nm_state_to_state[nm_state]
+ return device.nm_state_to_state[nm_state]
elif pspec.name == 'activation-stage':
return self._nm_device.get_activation_stage()
elif pspec.name == 'frequency':
diff --git a/src/model/devices/network/wired.py b/src/model/devices/network/wired.py
index 66c5206..aa0ba00 100644
--- a/src/model/devices/network/wired.py
+++ b/src/model/devices/network/wired.py
@@ -19,7 +19,7 @@ from model.devices import device
class Device(device.Device):
def __init__(self, nm_device):
device.Device.__init__(self)
- self._nm_device = device
+ self._nm_device = nm_device
def get_id(self):
return str(self._nm_device.get_op())
diff --git a/src/model/devices/network/wireless.py b/src/model/devices/network/wireless.py
index c45a08e..8bf407e 100644
--- a/src/model/devices/network/wireless.py
+++ b/src/model/devices/network/wireless.py
@@ -18,24 +18,22 @@
import gobject
from model.devices import device
-from hardware import nmclient
def freq_to_channel(freq):
- ftoc = { 2.412: 1, 2.417: 2, 2.422: 3, 2.427: 4,
- 2.432: 5, 2.437: 6, 2.442: 7, 2.447: 8,
- 2.452: 9, 2.457: 10, 2.462: 11, 2.467: 12,
- 2.472: 13
- }
- return ftoc[freq]
+ ftoc = { 2.412: 1, 2.417: 2, 2.422: 3, 2.427: 4,
+ 2.432: 5, 2.437: 6, 2.442: 7, 2.447: 8,
+ 2.452: 9, 2.457: 10, 2.462: 11, 2.467: 12,
+ 2.472: 13
+ }
+ return ftoc[freq]
def channel_to_freq(channel):
- ctof = { 1: 2.412, 2: 2.417, 3: 2.422, 4: 2.427,
- 5: 2.432, 6: 2.437, 7: 2.442, 8: 2.447,
- 9: 2.452, 10: 2.457, 11: 2.462, 12: 2.467,
- 13: 2.472
- }
- return ctof[channel]
-
+ ctof = { 1: 2.412, 2: 2.417, 3: 2.422, 4: 2.427,
+ 5: 2.432, 6: 2.437, 7: 2.442, 8: 2.447,
+ 9: 2.452, 10: 2.457, 11: 2.462, 12: 2.467,
+ 13: 2.472
+ }
+ return ctof[channel]
class Device(device.Device):
__gproperties__ = {
@@ -74,11 +72,12 @@ class Device(device.Device):
return self._nm_device.get_strength()
elif pspec.name == 'name':
import logging
- logging.debug('wireless.Device.props.name: %s' % self._nm_device.get_ssid())
+ logging.debug('wireless.Device.props.name: %s' %
+ self._nm_device.get_ssid())
return self._nm_device.get_ssid()
elif pspec.name == 'state':
nm_state = self._nm_device.get_state()
- return device._nm_state_to_state[nm_state]
+ return device.nm_state_to_state[nm_state]
elif pspec.name == 'frequency':
return self._nm_device.get_frequency()
diff --git a/src/model/homeactivity.py b/src/model/homeactivity.py
index 7365271..fa50932 100644
--- a/src/model/homeactivity.py
+++ b/src/model/homeactivity.py
@@ -15,7 +15,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import time
-import logging
import gobject
import dbus
diff --git a/src/model/homemodel.py b/src/model/homemodel.py
index 8de989c..5538f84 100644
--- a/src/model/homemodel.py
+++ b/src/model/homemodel.py
@@ -73,14 +73,14 @@ class HomeModel(gobject.GObject):
ret = []
for i in self._activities:
if i.get_window() is not None:
- ret.append(i)
+ ret.append(i)
return ret
def get_previous_activity(self):
activities = self._get_activities_with_window()
i = activities.index(self._pending_activity)
if len(activities) == 0:
- return None
+ return None
elif i - 1 >= 0:
return activities[i - 1]
else:
@@ -90,7 +90,7 @@ class HomeModel(gobject.GObject):
activities = self._get_activities_with_window()
i = activities.index(self._pending_activity)
if len(activities) == 0:
- return None
+ return None
elif i + 1 < len(activities):
return activities[i + 1]
else:
@@ -217,10 +217,10 @@ class HomeModel(gobject.GObject):
while window.get_transient() is not None:
window = window.get_transient()
- activity = self._get_activity_by_xid(window.get_xid())
- if activity is not None:
- self._set_pending_activity(activity)
- self._set_active_activity(activity)
+ act = self._get_activity_by_xid(window.get_xid())
+ if act is not None:
+ self._set_pending_activity(act)
+ self._set_active_activity(act)
def _add_activity(self, home_activity):
self._activities.append(home_activity)
@@ -257,7 +257,9 @@ class HomeModel(gobject.GObject):
registry = activity.get_registry()
activity_info = registry.get_activity(service_name)
if not activity_info:
- raise ValueError("Activity service name '%s' was not found in the bundle registry." % service_name)
+ raise ValueError("Activity service name '%s'" \
+ " was not found in the bundle registry."
+ % service_name)
home_activity = HomeActivity(activity_info, activity_id)
home_activity.props.launching = True
self._add_activity(home_activity)
@@ -274,12 +276,13 @@ class HomeModel(gobject.GObject):
home_activity.props.launching = False
self._remove_activity(home_activity)
else:
- logging.error('Model for activity id %s does not exist.' % activity_id)
+ logging.error('Model for activity id %s does not exist.'
+ % activity_id)
def _check_activity_launched(self, activity_id):
home_activity = self._get_activity_by_id(activity_id)
if home_activity and home_activity.props.launching:
- logging.debug('Activity %s still launching, assuming it failed...',
- activity_id)
+ logging.debug('Activity %s still launching, assuming it failed...'
+ % activity_id)
self.notify_activity_launch_failed(activity_id)
return False
diff --git a/src/model/shellmodel.py b/src/model/shellmodel.py
index 1834fcd..c2ec2e4 100644
--- a/src/model/shellmodel.py
+++ b/src/model/shellmodel.py
@@ -14,8 +14,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-import os
-
import wnck
import gobject
@@ -25,7 +23,6 @@ from model.MeshModel import MeshModel
from model.homemodel import HomeModel
from model.Owner import ShellOwner
from model.devices.devicesmodel import DevicesModel
-from sugar import env
class ShellModel(gobject.GObject):
STATE_STARTUP = 0
_______________________________________________
Sugar mailing list
[email protected]
http://lists.laptop.org/listinfo/sugar
