← Back to branch summary

~bmerry/duplicity/pydrive-regular

« back to all changes in this revision

Viewing changes to duplicity/backends/megabackend.py

  • Committer: Michael Terry
  • Date: 2014-04-17 20:50:57 UTC
  • mto: This revision was merged to the branch mainline in revision 975.
  • Revision ID: michael.terry@canonical.com-20140417205057-4cxo1yebh0oer02a
Solve except 2to3 fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
duplicity/backends/megabackend.py
80
80
 
81
81
            self.client.upload(source_path.get_canonical(), self.folder, dest_filename=remote_filename)
82
82
 
83
 
        except Exception, e:
 
83
        except Exception as e:
84
84
            self.__handle_error("Failed to upload file '%s' to remote folder '%s': %s"
85
85
                                % (source_path.get_canonical(), self.__get_node_name(self.folder), str(e)), raise_errors)
86
86
 
100
100
            else:
101
101
                self.__handle_error("Failed to find file '%s' in remote folder '%s'"
102
102
                                    % (remote_filename, self.__get_node_name(self.folder)), raise_errors)
103
 
        except Exception, e:
 
103
        except Exception as e:
104
104
            self.__handle_error("Failed to download file '%s' in remote folder '%s': %s"
105
105
                                 % (remote_filename, self.__get_node_name(self.folder), str(e)), raise_errors)
106
106
 
110
110
        try:
111
111
            entries = self.client.get_files_in_node(self.folder)
112
112
            return [ self.client.get_name_from_file({entry:entries[entry]}) for entry in entries]
113
 
        except Exception, e:
 
113
        except Exception as e:
114
114
            self.__handle_error("Failed to fetch list of files in remote folder '%s': %s"
115
115
                                % (self.__get_node_name(self.folder), str(e)), raise_errors)
116
116
 
129
129
                else:
130
130
                    log.Warn("Failed to fetch file '%s' in remote folder '%s'"
131
131
                             % (filename, self.__get_node_name(self.folder)))
132
 
            except Exception, e:
 
132
            except Exception as e:
133
133
                self.__handle_error("Failed to remove file '%s' in remote folder '%s': %s"
134
134
                                    % (filename, self.__get_node_name(self.folder), str(e)), raise_errors)
135
135
 
147
147
    def __authorize(self, email, password):
148
148
        try:
149
149
            self.client.login(email, password)
150
 
        except Exception, e:
 
150
        except Exception as e:
151
151
            self.__handle_error('Error while authenticating client: %s.' % str(e))
152
152
 
153
153
    def __filter_entries(self, entries, parent_id=None, title=None, type=None):
169
169
                result.update({k:v})
170
170
 
171
171
            return result
172
 
        except Exception, e:
 
172
        except Exception as e:
173
173
            self.__handle_error('Error while fetching remote entries: %s.' % str(e))
174
174
 
175
175
duplicity.backend.register_backend('mega', MegaBackend)