sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flake8 fixes (several remain to be fixed)

Browse Source
This commit is contained in:
James Cameron 2019-07-06 14:48:05 +10:00
parent 88ea8e1f4f
commit f5c86da271
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/sugar3/activity/activity.py
View File

@ -202,7 +202,8 @@ from errno import EEXIST
from gi.repository import SugarExt from gi.repository import SugarExt
def _(msg): return gettext.dgettext('sugar-toolkit-gtk3', msg) def _(msg):
return gettext.dgettext('sugar-toolkit-gtk3', msg)
SCOPE_PRIVATE = 'private' SCOPE_PRIVATE = 'private'
@ -288,16 +289,26 @@ class Activity(Window, Gtk.Container):
Initialise an Activity. Initialise an Activity.
Args: Args:
handle (:class:`~sugar3.activity.activityhandle.ActivityHandle`): instance providing the activity id and access to the presence service which *may* provide sharing for this application handle (:class:`~sugar3.activity.activityhandle.ActivityHandle`):
create_jobject (boolean): DEPRECATED: define if it should create a journal object if we are not resuming. The parameter is ignored, and always will be created a object in the Journal. instance providing the activity id and access to the presence
service which *may* provide sharing for this application
create_jobject (boolean):
DEPRECATED: define if it should create a journal object if
we are not resuming. The parameter is ignored, and always
will be created a object in the Journal.
**Signals:** **Signals:**
* **shared** - the activity has been shared on a network in order that other users may join, * **shared** - the activity has been shared on a network in
* **joined** - the activity has joined with other instances of the activity to create a shared network activity. order that other users may join,
* **joined** - the activity has joined with other instances of
the activity to create a shared network activity.
Side effects: Side effects:
* sets the gdk screen DPI setting (resolution) to the Sugar screen resolution. * sets the gdk screen DPI setting (resolution) to the Sugar
screen resolution.
* connects our "destroy" message to our _destroy_cb method. * connects our "destroy" message to our _destroy_cb method.
@ -1097,8 +1108,8 @@ class Activity(Window, Gtk.Container):
''' '''
self._invites_queue.append((account_path, contact_id)) self._invites_queue.append((account_path, contact_id))
if (self.shared_activity is None if (self.shared_activity is None or
or not self.shared_activity.props.joined): not self.shared_activity.props.joined):
self.share(True) self.share(True)
else: else:
self._send_invites() self._send_invites()
@ -1473,7 +1484,7 @@ class _ClientHandler(dbus.service.Object):
in_signature='ss', out_signature='v') in_signature='ss', out_signature='v')
def Get(self, interface_name, property_name): def Get(self, interface_name, property_name):
if interface_name in self._prop_getters \ if interface_name in self._prop_getters \
and property_name in self._prop_getters[interface_name]: and property_name in self._prop_getters[interface_name]:
return self._prop_getters[interface_name][property_name]() return self._prop_getters[interface_name][property_name]()
else: else:
logging.debug('InvalidArgument') logging.debug('InvalidArgument')
@ -1482,7 +1493,7 @@ class _ClientHandler(dbus.service.Object):
in_signature='ssv', out_signature='') in_signature='ssv', out_signature='')
def Set(self, interface_name, property_name, value): def Set(self, interface_name, property_name, value):
if interface_name in self._prop_setters \ if interface_name in self._prop_setters \
and property_name in self._prop_setters[interface_name]: and property_name in self._prop_setters[interface_name]:
self._prop_setters[interface_name][property_name](value) self._prop_setters[interface_name][property_name](value)
else: else:
logging.debug('PermissionDenied') logging.debug('PermissionDenied')
@ -1498,6 +1509,7 @@ class _ClientHandler(dbus.service.Object):
else: else:
logging.debug('InvalidArgument') logging.debug('InvalidArgument')
_session = None _session = None