Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/sugar
diff options
context:
space:
mode:
authorSascha Silbe <sascha-pgp@silbe.org>2010-10-15 17:53:25 (GMT)
committer Sascha Silbe <sascha-pgp@silbe.org>2010-11-23 16:14:32 (GMT)
commite2231d56203dcc58cc8a8a873ab1eef1b56a629e (patch)
tree4ab1f9f1c4284515a1f83cb359b1d89c3c938a54 /src/sugar
parent131c28bb724d89900a1707ad4cae726ba8e9ce5a (diff)
PEP8 cleanup: fix number of blank lines
Caught by pep8. Reviewed-by: James Cameron <quozl@laptop.org> Acked-by: Simon Schampijer <simon@laptop.org> CC: Aleksey Lim <alsroot@member.fsf.org>
Diffstat (limited to 'src/sugar')
-rw-r--r--src/sugar/activity/activity.py1
-rw-r--r--src/sugar/graphics/alert.py2
-rw-r--r--src/sugar/graphics/palettewindow.py1
-rw-r--r--src/sugar/presence/activity.py3
-rw-r--r--src/sugar/presence/buddy.py1
-rw-r--r--src/sugar/presence/connectionmanager.py4
-rw-r--r--src/sugar/presence/presenceservice.py2
-rw-r--r--src/sugar/wm.py3
8 files changed, 15 insertions, 2 deletions
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index 0bda2ea..6774703 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -98,6 +98,7 @@ J_DBUS_INTERFACE = 'org.laptop.Journal'
CONN_INTERFACE_ACTIVITY_PROPERTIES = 'org.laptop.Telepathy.ActivityProperties'
+
class _ActivitySession(gobject.GObject):
__gsignals__ = {
diff --git a/src/sugar/graphics/alert.py b/src/sugar/graphics/alert.py
index a4dd017..0202a66 100644
--- a/src/sugar/graphics/alert.py
+++ b/src/sugar/graphics/alert.py
@@ -291,6 +291,7 @@ class ConfirmationAlert(Alert):
self.add_button(gtk.RESPONSE_OK, _('Ok'), icon)
icon.show()
+
class ErrorAlert(Alert):
"""
This is a ready-made one button (Ok) alert.
@@ -336,6 +337,7 @@ class ErrorAlert(Alert):
self.add_button(gtk.RESPONSE_OK, _('Ok'), icon)
icon.show()
+
class _TimeoutIcon(hippo.CanvasText, hippo.CanvasItem):
"""An icon with a round border"""
__gtype_name__ = 'AlertTimeoutIcon'
diff --git a/src/sugar/graphics/palettewindow.py b/src/sugar/graphics/palettewindow.py
index f51c938..e76e952 100644
--- a/src/sugar/graphics/palettewindow.py
+++ b/src/sugar/graphics/palettewindow.py
@@ -669,6 +669,7 @@ class Invoker(gobject.GObject):
if not self.props.cache_palette:
self.set_palette(None)
+
class WidgetInvoker(Invoker):
def __init__(self, parent=None, widget=None):
diff --git a/src/sugar/presence/activity.py b/src/sugar/presence/activity.py
index aa6b396..a1b7a50 100644
--- a/src/sugar/presence/activity.py
+++ b/src/sugar/presence/activity.py
@@ -463,11 +463,13 @@ class Activity(gobject.GObject):
_logger.debug('%r: leaving', self)
self.telepathy_text_chan.Close()
+
class _BaseCommand(gobject.GObject):
__gsignals__ = {
'finished': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
([object])),
}
+
def __init__(self):
gobject.GObject.__init__(self)
@@ -532,6 +534,7 @@ class _ShareCommand(_BaseCommand):
self._finished = True
self.emit('finished', error)
+
class _JoinCommand(_BaseCommand):
def __init__(self, connection, room_handle):
_BaseCommand.__init__(self)
diff --git a/src/sugar/presence/buddy.py b/src/sugar/presence/buddy.py
index 0a72a36..b83bc51 100644
--- a/src/sugar/presence/buddy.py
+++ b/src/sugar/presence/buddy.py
@@ -144,6 +144,7 @@ class BaseBuddy(gobject.GObject):
class Buddy(BaseBuddy):
__gtype_name__ = 'PresenceBuddy'
+
def __init__(self, account_path, contact_id):
_logger.debug('Buddy.__init__')
BaseBuddy.__init__(self)
diff --git a/src/sugar/presence/connectionmanager.py b/src/sugar/presence/connectionmanager.py
index e681eb6..6604d3f 100644
--- a/src/sugar/presence/connectionmanager.py
+++ b/src/sugar/presence/connectionmanager.py
@@ -31,12 +31,14 @@ from telepathy.constants import CONNECTION_STATUS_CONNECTED
ACCOUNT_MANAGER_SERVICE = 'org.freedesktop.Telepathy.AccountManager'
ACCOUNT_MANAGER_PATH = '/org/freedesktop/Telepathy/AccountManager'
+
class Connection(object):
def __init__(self, account_path, connection):
self.account_path = account_path
self.connection = connection
self.connected = False
+
class ConnectionManager(object):
"""Track available telepathy connections"""
@@ -108,8 +110,8 @@ class ConnectionManager(object):
return account_path
return None
-_connection_manager = None
+_connection_manager = None
def get_connection_manager():
global _connection_manager
if not _connection_manager:
diff --git a/src/sugar/presence/presenceservice.py b/src/sugar/presence/presenceservice.py
index 51d8625..fa5edcf 100644
--- a/src/sugar/presence/presenceservice.py
+++ b/src/sugar/presence/presenceservice.py
@@ -37,6 +37,7 @@ from telepathy.interfaces import ACCOUNT, \
CONNECTION
from telepathy.constants import HANDLE_TYPE_CONTACT
+
_logger = logging.getLogger('sugar.presence.presenceservice')
ACCOUNT_MANAGER_SERVICE = 'org.freedesktop.Telepathy.AccountManager'
@@ -44,6 +45,7 @@ ACCOUNT_MANAGER_PATH = '/org/freedesktop/Telepathy/AccountManager'
CONN_INTERFACE_ACTIVITY_PROPERTIES = 'org.laptop.Telepathy.ActivityProperties'
+
class PresenceService(gobject.GObject):
"""Provides simplified access to the Telepathy framework to activities"""
__gsignals__ = {
diff --git a/src/sugar/wm.py b/src/sugar/wm.py
index 3bf1421..eaa196e 100644
--- a/src/sugar/wm.py
+++ b/src/sugar/wm.py
@@ -22,6 +22,7 @@ UNSTABLE. Used only internally by Activity and jarabe.
import gtk
import logging
+
def _property_get_trapped(window, prop, prop_type):
gtk.gdk.error_trap_push()
@@ -35,6 +36,7 @@ def _property_get_trapped(window, prop, prop_type):
return prop_info
+
def _property_change_trapped(window, prop, prop_type, format, mode, data):
gtk.gdk.error_trap_push()
@@ -83,4 +85,3 @@ def set_activity_id(window, activity_id):
def set_bundle_id(window, bundle_id):
_property_change_trapped(window, '_SUGAR_BUNDLE_ID', 'STRING', 8,
gtk.gdk.PROP_MODE_REPLACE, bundle_id)
-