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

Fix pep8 errors

Browse Source 
pep8 1.6.4 detects more issues
master
Daniel Narvaez 11 years ago
parent b65be8d44b
commit 6d2b97daec
4 changed files with 196 additions and 205 deletions
Show Stats Download Patch File Download Diff File

8
src/sugar3/bundle/bundleversion.py
Unescape Escape View File

@ -93,8 +93,8 @@ class NormalizedVersion(object):
"""
if len(version_string) > 1 and version_string[0] == '0':
raise InvalidVersionError("Can not have leading zero in segment"
" %s in %r" % (version_string,
self._activity_version))
" %s in %r" %
(version_string, self._activity_version))
return int(version_string)
@ -112,8 +112,8 @@ class NormalizedVersion(object):
for n in extraversion_string.split("."):
if len(n) > 1 and n[0] == '0':
raise InvalidVersionError("Can not have leading zero in "
"segment %s in %r" % (n,
self._activity_version))
"segment %s in %r"
% (n, self._activity_version))
nums.append(int(n))
while nums and nums[-1] == 0:

362
src/sugar3/graphics/xocolor.py
Unescape Escape View File

@ -24,188 +24,186 @@ import logging
from gi.repository import GConf
colors = [
['#B20008', '#FF2B34'],
['#FF2B34', '#B20008'],
['#E6000A', '#FF2B34'],
['#FF2B34', '#E6000A'],
['#FFADCE', '#FF2B34'],
['#9A5200', '#FF2B34'],
['#FF2B34', '#9A5200'],
['#FF8F00', '#FF2B34'],
['#FF2B34', '#FF8F00'],
['#FFC169', '#FF2B34'],
['#807500', '#FF2B34'],
['#FF2B34', '#807500'],
['#BE9E00', '#FF2B34'],
['#FF2B34', '#BE9E00'],
['#F8E800', '#FF2B34'],
['#008009', '#FF2B34'],
['#FF2B34', '#008009'],
['#00B20D', '#FF2B34'],
['#FF2B34', '#00B20D'],
['#8BFF7A', '#FF2B34'],
['#00588C', '#FF2B34'],
['#FF2B34', '#00588C'],
['#005FE4', '#FF2B34'],
['#FF2B34', '#005FE4'],
['#BCCDFF', '#FF2B34'],
['#5E008C', '#FF2B34'],
['#FF2B34', '#5E008C'],
['#7F00BF', '#FF2B34'],
['#FF2B34', '#7F00BF'],
['#D1A3FF', '#FF2B34'],
['#9A5200', '#FF8F00'],
['#FF8F00', '#9A5200'],
['#C97E00', '#FF8F00'],
['#FF8F00', '#C97E00'],
['#FFC169', '#FF8F00'],
['#807500', '#FF8F00'],
['#FF8F00', '#807500'],
['#BE9E00', '#FF8F00'],
['#FF8F00', '#BE9E00'],
['#F8E800', '#FF8F00'],
['#008009', '#FF8F00'],
['#FF8F00', '#008009'],
['#00B20D', '#FF8F00'],
['#FF8F00', '#00B20D'],
['#8BFF7A', '#FF8F00'],
['#00588C', '#FF8F00'],
['#FF8F00', '#00588C'],
['#005FE4', '#FF8F00'],
['#FF8F00', '#005FE4'],
['#BCCDFF', '#FF8F00'],
['#5E008C', '#FF8F00'],
['#FF8F00', '#5E008C'],
['#A700FF', '#FF8F00'],
['#FF8F00', '#A700FF'],
['#D1A3FF', '#FF8F00'],
['#B20008', '#FF8F00'],
['#FF8F00', '#B20008'],
['#FF2B34', '#FF8F00'],
['#FF8F00', '#FF2B34'],
['#FFADCE', '#FF8F00'],
['#807500', '#F8E800'],
['#F8E800', '#807500'],
['#BE9E00', '#F8E800'],
['#F8E800', '#BE9E00'],
['#FFFA00', '#EDDE00'],
['#008009', '#F8E800'],
['#F8E800', '#008009'],
['#00EA11', '#F8E800'],
['#F8E800', '#00EA11'],
['#8BFF7A', '#F8E800'],
['#00588C', '#F8E800'],
['#F8E800', '#00588C'],
['#00A0FF', '#F8E800'],
['#F8E800', '#00A0FF'],
['#BCCEFF', '#F8E800'],
['#5E008C', '#F8E800'],
['#F8E800', '#5E008C'],
['#AC32FF', '#F8E800'],
['#F8E800', '#AC32FF'],
['#D1A3FF', '#F8E800'],
['#B20008', '#F8E800'],
['#F8E800', '#B20008'],
['#FF2B34', '#F8E800'],
['#F8E800', '#FF2B34'],
['#FFADCE', '#F8E800'],
['#9A5200', '#F8E800'],
['#F8E800', '#9A5200'],
['#FF8F00', '#F8E800'],
['#F8E800', '#FF8F00'],
['#FFC169', '#F8E800'],
['#008009', '#00EA11'],
['#00EA11', '#008009'],
['#00B20D', '#00EA11'],
['#00EA11', '#00B20D'],
['#8BFF7A', '#00EA11'],
['#00588C', '#00EA11'],
['#00EA11', '#00588C'],
['#005FE4', '#00EA11'],
['#00EA11', '#005FE4'],
['#BCCDFF', '#00EA11'],
['#5E008C', '#00EA11'],
['#00EA11', '#5E008C'],
['#7F00BF', '#00EA11'],
['#00EA11', '#7F00BF'],
['#D1A3FF', '#00EA11'],
['#B20008', '#00EA11'],
['#00EA11', '#B20008'],
['#FF2B34', '#00EA11'],
['#00EA11', '#FF2B34'],
['#FFADCE', '#00EA11'],
['#9A5200', '#00EA11'],
['#00EA11', '#9A5200'],
['#FF8F00', '#00EA11'],
['#00EA11', '#FF8F00'],
['#FFC169', '#00EA11'],
['#807500', '#00EA11'],
['#00EA11', '#807500'],
['#BE9E00', '#00EA11'],
['#00EA11', '#BE9E00'],
['#F8E800', '#00EA11'],
['#00588C', '#00A0FF'],
['#00A0FF', '#00588C'],
['#005FE4', '#00A0FF'],
['#00A0FF', '#005FE4'],
['#BCCDFF', '#00A0FF'],
['#5E008C', '#00A0FF'],
['#00A0FF', '#5E008C'],
['#9900E6', '#00A0FF'],
['#00A0FF', '#9900E6'],
['#D1A3FF', '#00A0FF'],
['#B20008', '#00A0FF'],
['#00A0FF', '#B20008'],
['#FF2B34', '#00A0FF'],
['#00A0FF', '#FF2B34'],
['#FFADCE', '#00A0FF'],
['#9A5200', '#00A0FF'],
['#00A0FF', '#9A5200'],
['#FF8F00', '#00A0FF'],
['#00A0FF', '#FF8F00'],
['#FFC169', '#00A0FF'],
['#807500', '#00A0FF'],
['#00A0FF', '#807500'],
['#BE9E00', '#00A0FF'],
['#00A0FF', '#BE9E00'],
['#F8E800', '#00A0FF'],
['#008009', '#00A0FF'],
['#00A0FF', '#008009'],
['#00B20D', '#00A0FF'],
['#00A0FF', '#00B20D'],
['#8BFF7A', '#00A0FF'],
['#5E008C', '#AC32FF'],
['#AC32FF', '#5E008C'],
['#7F00BF', '#AC32FF'],
['#AC32FF', '#7F00BF'],
['#D1A3FF', '#AC32FF'],
['#B20008', '#AC32FF'],
['#AC32FF', '#B20008'],
['#FF2B34', '#AC32FF'],
['#AC32FF', '#FF2B34'],
['#FFADCE', '#AC32FF'],
['#9A5200', '#AC32FF'],
['#AC32FF', '#9A5200'],
['#FF8F00', '#AC32FF'],
['#AC32FF', '#FF8F00'],
['#FFC169', '#AC32FF'],
['#807500', '#AC32FF'],
['#AC32FF', '#807500'],
['#BE9E00', '#AC32FF'],
['#AC32FF', '#BE9E00'],
['#F8E800', '#AC32FF'],
['#008009', '#AC32FF'],
['#AC32FF', '#008009'],
['#00B20D', '#AC32FF'],
['#AC32FF', '#00B20D'],
['#8BFF7A', '#AC32FF'],
['#00588C', '#AC32FF'],
['#AC32FF', '#00588C'],
['#005FE4', '#AC32FF'],
['#AC32FF', '#005FE4'],
['#BCCDFF', '#AC32FF'],
]
colors = [['#B20008', '#FF2B34'],
['#FF2B34', '#B20008'],
['#E6000A', '#FF2B34'],
['#FF2B34', '#E6000A'],
['#FFADCE', '#FF2B34'],
['#9A5200', '#FF2B34'],
['#FF2B34', '#9A5200'],
['#FF8F00', '#FF2B34'],
['#FF2B34', '#FF8F00'],
['#FFC169', '#FF2B34'],
['#807500', '#FF2B34'],
['#FF2B34', '#807500'],
['#BE9E00', '#FF2B34'],
['#FF2B34', '#BE9E00'],
['#F8E800', '#FF2B34'],
['#008009', '#FF2B34'],
['#FF2B34', '#008009'],
['#00B20D', '#FF2B34'],
['#FF2B34', '#00B20D'],
['#8BFF7A', '#FF2B34'],
['#00588C', '#FF2B34'],
['#FF2B34', '#00588C'],
['#005FE4', '#FF2B34'],
['#FF2B34', '#005FE4'],
['#BCCDFF', '#FF2B34'],
['#5E008C', '#FF2B34'],
['#FF2B34', '#5E008C'],
['#7F00BF', '#FF2B34'],
['#FF2B34', '#7F00BF'],
['#D1A3FF', '#FF2B34'],
['#9A5200', '#FF8F00'],
['#FF8F00', '#9A5200'],
['#C97E00', '#FF8F00'],
['#FF8F00', '#C97E00'],
['#FFC169', '#FF8F00'],
['#807500', '#FF8F00'],
['#FF8F00', '#807500'],
['#BE9E00', '#FF8F00'],
['#FF8F00', '#BE9E00'],
['#F8E800', '#FF8F00'],
['#008009', '#FF8F00'],
['#FF8F00', '#008009'],
['#00B20D', '#FF8F00'],
['#FF8F00', '#00B20D'],
['#8BFF7A', '#FF8F00'],
['#00588C', '#FF8F00'],
['#FF8F00', '#00588C'],
['#005FE4', '#FF8F00'],
['#FF8F00', '#005FE4'],
['#BCCDFF', '#FF8F00'],
['#5E008C', '#FF8F00'],
['#FF8F00', '#5E008C'],
['#A700FF', '#FF8F00'],
['#FF8F00', '#A700FF'],
['#D1A3FF', '#FF8F00'],
['#B20008', '#FF8F00'],
['#FF8F00', '#B20008'],
['#FF2B34', '#FF8F00'],
['#FF8F00', '#FF2B34'],
['#FFADCE', '#FF8F00'],
['#807500', '#F8E800'],
['#F8E800', '#807500'],
['#BE9E00', '#F8E800'],
['#F8E800', '#BE9E00'],
['#FFFA00', '#EDDE00'],
['#008009', '#F8E800'],
['#F8E800', '#008009'],
['#00EA11', '#F8E800'],
['#F8E800', '#00EA11'],
['#8BFF7A', '#F8E800'],
['#00588C', '#F8E800'],
['#F8E800', '#00588C'],
['#00A0FF', '#F8E800'],
['#F8E800', '#00A0FF'],
['#BCCEFF', '#F8E800'],
['#5E008C', '#F8E800'],
['#F8E800', '#5E008C'],
['#AC32FF', '#F8E800'],
['#F8E800', '#AC32FF'],
['#D1A3FF', '#F8E800'],
['#B20008', '#F8E800'],
['#F8E800', '#B20008'],
['#FF2B34', '#F8E800'],
['#F8E800', '#FF2B34'],
['#FFADCE', '#F8E800'],
['#9A5200', '#F8E800'],
['#F8E800', '#9A5200'],
['#FF8F00', '#F8E800'],
['#F8E800', '#FF8F00'],
['#FFC169', '#F8E800'],
['#008009', '#00EA11'],
['#00EA11', '#008009'],
['#00B20D', '#00EA11'],
['#00EA11', '#00B20D'],
['#8BFF7A', '#00EA11'],
['#00588C', '#00EA11'],
['#00EA11', '#00588C'],
['#005FE4', '#00EA11'],
['#00EA11', '#005FE4'],
['#BCCDFF', '#00EA11'],
['#5E008C', '#00EA11'],
['#00EA11', '#5E008C'],
['#7F00BF', '#00EA11'],
['#00EA11', '#7F00BF'],
['#D1A3FF', '#00EA11'],
['#B20008', '#00EA11'],
['#00EA11', '#B20008'],
['#FF2B34', '#00EA11'],
['#00EA11', '#FF2B34'],
['#FFADCE', '#00EA11'],
['#9A5200', '#00EA11'],
['#00EA11', '#9A5200'],
['#FF8F00', '#00EA11'],
['#00EA11', '#FF8F00'],
['#FFC169', '#00EA11'],
['#807500', '#00EA11'],
['#00EA11', '#807500'],
['#BE9E00', '#00EA11'],
['#00EA11', '#BE9E00'],
['#F8E800', '#00EA11'],
['#00588C', '#00A0FF'],
['#00A0FF', '#00588C'],
['#005FE4', '#00A0FF'],
['#00A0FF', '#005FE4'],
['#BCCDFF', '#00A0FF'],
['#5E008C', '#00A0FF'],
['#00A0FF', '#5E008C'],
['#9900E6', '#00A0FF'],
['#00A0FF', '#9900E6'],
['#D1A3FF', '#00A0FF'],
['#B20008', '#00A0FF'],
['#00A0FF', '#B20008'],
['#FF2B34', '#00A0FF'],
['#00A0FF', '#FF2B34'],
['#FFADCE', '#00A0FF'],
['#9A5200', '#00A0FF'],
['#00A0FF', '#9A5200'],
['#FF8F00', '#00A0FF'],
['#00A0FF', '#FF8F00'],
['#FFC169', '#00A0FF'],
['#807500', '#00A0FF'],
['#00A0FF', '#807500'],
['#BE9E00', '#00A0FF'],
['#00A0FF', '#BE9E00'],
['#F8E800', '#00A0FF'],
['#008009', '#00A0FF'],
['#00A0FF', '#008009'],
['#00B20D', '#00A0FF'],
['#00A0FF', '#00B20D'],
['#8BFF7A', '#00A0FF'],
['#5E008C', '#AC32FF'],
['#AC32FF', '#5E008C'],
['#7F00BF', '#AC32FF'],
['#AC32FF', '#7F00BF'],
['#D1A3FF', '#AC32FF'],
['#B20008', '#AC32FF'],
['#AC32FF', '#B20008'],
['#FF2B34', '#AC32FF'],
['#AC32FF', '#FF2B34'],
['#FFADCE', '#AC32FF'],
['#9A5200', '#AC32FF'],
['#AC32FF', '#9A5200'],
['#FF8F00', '#AC32FF'],
['#AC32FF', '#FF8F00'],
['#FFC169', '#AC32FF'],
['#807500', '#AC32FF'],
['#AC32FF', '#807500'],
['#BE9E00', '#AC32FF'],
['#AC32FF', '#BE9E00'],
['#F8E800', '#AC32FF'],
['#008009', '#AC32FF'],
['#AC32FF', '#008009'],
['#00B20D', '#AC32FF'],
['#AC32FF', '#00B20D'],
['#8BFF7A', '#AC32FF'],
['#00588C', '#AC32FF'],
['#AC32FF', '#00588C'],
['#005FE4', '#AC32FF'],
['#AC32FF', '#005FE4'],
['#BCCDFF', '#AC32FF']]
def _parse_string(color_string):

28
src/sugar3/mime.py
Unescape Escape View File

@ -49,31 +49,26 @@ def _get_supported_image_mime_types():
_extensions = {}
_globs_timestamps = []
_generic_types = [
{
'id': GENERIC_TYPE_TEXT,
'name': _('Text'),
'icon': 'text-x-generic',
'types': [
'text/plain', 'text/rtf', 'application/pdf', 'application/x-pdf',
'text/html', 'application/vnd.oasis.opendocument.text',
'application/rtf', 'text/rtf', 'application/epub+zip'],
},
{
_generic_types = [{
'id': GENERIC_TYPE_TEXT,
'name': _('Text'),
'icon': 'text-x-generic',
'types': ['text/plain', 'text/rtf', 'application/pdf', 'application/x-pdf',
'text/html', 'application/vnd.oasis.opendocument.text',
'application/rtf', 'text/rtf', 'application/epub+zip'],
}, {
'id': GENERIC_TYPE_IMAGE,
'name': _('Image'),
'icon': 'image-x-generic',
'types': _get_supported_image_mime_types(),
},
{
}, {
'id': GENERIC_TYPE_AUDIO,
'name': _('Audio'),
'icon': 'audio-x-generic',
'types': [
'audio/ogg', 'audio/x-wav', 'audio/wav', 'audio/x-vorbis+ogg',
'audio/x-mpegurl', 'audio/mpegurl', 'audio/mpeg', 'audio/x-scpls'],
},
{
}, {
'id': GENERIC_TYPE_VIDEO,
'name': _('Video'),
'icon': 'video-x-generic',
@ -84,8 +79,7 @@ _generic_types = [
'video/mp4', 'video/x-matroska', 'video/x-msvideo',
'application/x-ogm-video', 'video/quicktime', 'video/x-quicktime'
'video/avi'],
},
{
}, {
'id': GENERIC_TYPE_LINK,
'name': _('Link'),
'icon': 'text-uri-list',

3
src/sugar3/presence/activity.py
Unescape Escape View File

@ -643,8 +643,7 @@ class _JoinCommand(_BaseCommand):
group.AddMembers([self_handle], '',
reply_handler=lambda: None,
error_handler=lambda e: self._join_failed_cb(
e,
'got_all_members AddMembers'))
e, 'got_all_members AddMembers'))
if members:
self.__text_channel_members_changed_cb('', members, (),

Write Preview
Loading…
Cancel
Save