Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pep8 #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pep8 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions activity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
#Copyright (c) 2011-2013 Walter Bender
# Copyright (c) 2011-2013 Walter Bender

# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -114,7 +114,7 @@ def _get_selected_path(self, widget, store):
image_path = store.get(iter_, 1)[0]

return image_path, iter_
except:
except BaseException:
return None

def _clipart_selected(self, widget, store):
Expand Down Expand Up @@ -156,7 +156,7 @@ def _fill_clipart_list(store):
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
filepath, style.XLARGE_ICON_SIZE,
style.XLARGE_ICON_SIZE)
except:
except BaseException:
pass
else:
store.append([pixbuf, filepath])
Expand Down
29 changes: 14 additions & 15 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
#!/usr/bin/env python
import os
import sys

if len(sys.argv) > 1 and '--no-sugar' == sys.argv[1]:
# Remove the argument from the stack so we don't cause problems
# for distutils
sys.argv.pop(1)
import glob, os.path, string

import glob
from distutils.core import setup

DATA_FILES = [
('icons', glob.glob('icons/*')),
('images', glob.glob('images/*')),
('/usr/share/applications', ['turtleart.desktop'])
]
]

setup (name = 'Turtle Art',
description = "A LOGO-like tool for teaching programming",
author = "Walter Bender",
author_email = "[email protected]",
version = '0.9.4',
packages = ['TurtleArt'],
scripts = ['turtleart'],
data_files = DATA_FILES,
)
else:
setup(name='Turtle Art',
description="A LOGO-like tool for teaching programming",
author="Walter Bender",
author_email="[email protected]",
version='0.9.4',
packages=['TurtleArt'],
scripts=['turtleart'],
data_files=DATA_FILES,
)
else:
from sugar3.activity import bundlebuilder

if __name__ == "__main__":
Expand Down