diff options
| author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-01-04 15:01:29 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-01-04 15:01:29 (GMT) |
| commit | 7aa2e148538518a611f8c375899355f5869edcfa (patch) | |
| tree | c92841c75567f7c76474d45a361028ff0f3aa934 /src | |
| parent | 6e0baaa973d2320f80258d1872d13dfa0f04771e (diff) | |
Misc pylint fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/desktop/favoritesview.py | 2 | ||||
| -rw-r--r-- | src/jarabe/frame/clipboardmenu.py | 4 | ||||
| -rw-r--r-- | src/jarabe/journal/listview.py | 2 | ||||
| -rw-r--r-- | src/jarabe/journal/palettes.py | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index f6bb407..fb8dfc1 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -35,8 +35,6 @@ from jarabe.view.palettes import JournalPalette from jarabe.view.palettes import CurrentActivityPalette, ActivityPalette from jarabe.model import shell from jarabe.model import bundleregistry -from jarabe.controlpanel.gui import ControlPanel -from jarabe.model.session import get_session_manager from jarabe.desktop import schoolserver from jarabe.desktop.schoolserver import RegisterError diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py index be891d0..d1d4105 100644 --- a/src/jarabe/frame/clipboardmenu.py +++ b/src/jarabe/frame/clipboardmenu.py @@ -242,8 +242,6 @@ class ClipboardMenu(Palette): jobject.metadata['mime_type'] = mime_type jobject.file_path = file_path - uid = datastore.write(jobject, transfer_ownership=transfer_ownership) - - jobject.metadata['uid'] = uid + datastore.write(jobject, transfer_ownership=transfer_ownership) return jobject diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py index 01ec8b1..323da8d 100644 --- a/src/jarabe/journal/listview.py +++ b/src/jarabe/journal/listview.py @@ -357,7 +357,7 @@ class BaseListView(gtk.HBox): if selection.target == 'text/uri-list': # Get hold of a reference so the temp file doesn't get deleted self._temp_file_path = model.get_file(metadata) - selection.set(selection.target, 8, file_path) + selection.set(selection.target, 8, self._temp_file_path) elif selection.target == 'journal-object-id': selection.set(selection.target, 8, metadata['uid']) diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py index 1345f43..9730dee 100644 --- a/src/jarabe/journal/palettes.py +++ b/src/jarabe/journal/palettes.py @@ -105,8 +105,8 @@ class ObjectPalette(Palette): def __clipboard_get_func_cb(self, clipboard, selection_data, info, data): # Get hold of a reference so the temp file doesn't get deleted self._temp_file_path = model.get_file(self._metadata['uid']) - logging.debug('__clipboard_get_func_cb %r' % file_path) - selection_data.set_uris(['file://' + file_path]) + logging.debug('__clipboard_get_func_cb %r' % self._temp_file_path) + selection_data.set_uris(['file://' + self._temp_file_path]) def __clipboard_clear_func_cb(self, clipboard, data): # Release and delete the temp file |