diff options
| author | Simon Schampijer <simon@schampijer.de> | 2008-08-14 16:54:10 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2008-08-14 16:54:10 (GMT) |
| commit | 57deb085513c05e738a81a9ebe89bde47778c1f0 (patch) | |
| tree | 2d4c0ad31a328a78c7bf78234e9d5674420a9a13 /service | |
| parent | 54bdb6ab0b7de69cc75c0fde5040cea51be90694 (diff) | |
Revert "Merge branch 'master' of git://dev.laptop.org/sugar"
This reverts commit 54bdb6ab0b7de69cc75c0fde5040cea51be90694.
Diffstat (limited to 'service')
| -rw-r--r-- | service/bundleregistry.py | 5 | ||||
| -rw-r--r-- | service/config.py.in | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/service/bundleregistry.py b/service/bundleregistry.py index f40b6d6..e7c30a8 100644 --- a/service/bundleregistry.py +++ b/service/bundleregistry.py @@ -53,7 +53,7 @@ class BundleRegistry(gobject.GObject): try: self._load_favorites() - except Exception: + except Exception, e: logging.error('Error while loading favorite_activities\n%s.' \ % traceback.format_exc()) @@ -105,8 +105,7 @@ class BundleRegistry(gobject.GObject): raise ValueError('Invalid format in %s.' % favorites_path) first_value = favorite_bundles.values()[0] - if first_value is not None and \ - not isinstance(first_value, dict): + if first_value is not None and not isinstance(first_value, dict): raise ValueError('Invalid format in %s.' % favorites_path) self._last_defaults_mtime = float(favorites_data['defaults-mtime']) diff --git a/service/config.py.in b/service/config.py.in index 3374006..c617d7e 100644 --- a/service/config.py.in +++ b/service/config.py.in @@ -14,7 +14,4 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# pylint: disable-msg=C0301 - data_path = '@prefix@/share/sugar/data' - |