diff options
| author | Simon Schampijer <simon@schampijer.de> | 2009-08-20 13:28:00 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2009-08-20 13:28:00 (GMT) |
| commit | f4e1500a00804812481a5a0b2aa4be13eba8f3dc (patch) | |
| tree | 4c38984fed283d21007d53415818ed0330591afb /src/jarabe/frame/clipboardmenu.py | |
| parent | d4da49bebd1b0cbd12e80ff471dee12593440e0a (diff) | |
| parent | d57bb1b20aa123821d1008432620fb316645e34b (diff) | |
Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline
Diffstat (limited to 'src/jarabe/frame/clipboardmenu.py')
| -rw-r--r-- | src/jarabe/frame/clipboardmenu.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py index d1d4105..8a8ba11 100644 --- a/src/jarabe/frame/clipboardmenu.py +++ b/src/jarabe/frame/clipboardmenu.py @@ -204,26 +204,26 @@ class ClipboardMenu(Palette): def _copy_to_journal(self): formats = self._cb_object.get_formats().keys() most_significant_mime_type = mime.choose_most_significant(formats) - format = self._cb_object.get_formats()[most_significant_mime_type] + format_ = self._cb_object.get_formats()[most_significant_mime_type] transfer_ownership = False if most_significant_mime_type == 'text/uri-list': - uris = mime.split_uri_list(format.get_data()) + uris = mime.split_uri_list(format_.get_data()) if len(uris) == 1 and uris[0].startswith('file://'): file_path = urlparse.urlparse(uris[0]).path transfer_ownership = False mime_type = mime.get_for_file(file_path) else: - file_path = self._write_to_temp_file(format.get_data()) + file_path = self._write_to_temp_file(format_.get_data()) transfer_ownership = True mime_type = 'text/uri-list' else: - if format.is_on_disk(): - file_path = urlparse.urlparse(format.get_data()).path + if format_.is_on_disk(): + file_path = urlparse.urlparse(format_.get_data()).path transfer_ownership = False mime_type = mime.get_for_file(file_path) else: - file_path = self._write_to_temp_file(format.get_data()) + file_path = self._write_to_temp_file(format_.get_data()) transfer_ownership = True sniffed_mime_type = mime.get_for_file(file_path) if sniffed_mime_type == 'application/octet-stream': |