diff --git a/deluge/core/core.py b/deluge/core/core.py index 6b6757d34..2a2ad3158 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -293,7 +293,7 @@ class Core(component.Component): result.addCallbacks(on_download_success, on_download_fail) else: # Log the error and pass the failure onto the client - log.error("Error occured downloading torrent from %s", url) + log.error("Error occurred downloading torrent from %s", url) log.error("Reason: %s", failure.getErrorMessage()) result = failure return result diff --git a/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py b/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py index 4d793ed15..730f166d5 100644 --- a/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py +++ b/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py @@ -350,7 +350,7 @@ class Core(CorePluginBase): """ Recovers from download error - :param f: failure that occured + :param f: failure that occurred :type f: Failure :returns: a Deferred if recovery was possible else the original failure @@ -470,7 +470,7 @@ class Core(CorePluginBase): """ Recovers from import error - :param f: failure that occured + :param f: failure that occurred :type f: Failure :returns: a Deferred if recovery was possible else the original failure diff --git a/deluge/transfer.py b/deluge/transfer.py index f27a65460..836b0cee2 100644 --- a/deluge/transfer.py +++ b/deluge/transfer.py @@ -128,7 +128,7 @@ class DelugeTransferProtocol(Protocol): # Remove the header from the buffer self._buffer = self._buffer[MESSAGE_HEADER_SIZE:] except Exception, e: - log.warn("Error occured when parsing message header: %s." % str(e)) + log.warn("Error occurred when parsing message header: %s." % str(e)) log.warn("This version of Deluge cannot communicate with the sender of this data.") self._message_length = 0 self._buffer = "" diff --git a/deluge/ui/client.py b/deluge/ui/client.py index a2a5136c7..12354218a 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -208,7 +208,7 @@ class DelugeRPCProtocol(DelugeTransferProtocol): # Send the request in a tuple because multiple requests can be sent at once self.transfer_message((request.format_message(),)) except Exception, e: - log.warn("Error occured when sending message:" + str(e)) + log.warn("Error occurred when sending message:" + str(e)) class DelugeRPCClientFactory(ClientFactory): protocol = DelugeRPCProtocol diff --git a/deluge/ui/console/commands/plugin.py b/deluge/ui/console/commands/plugin.py index 02ffb89e8..930355dc5 100644 --- a/deluge/ui/console/commands/plugin.py +++ b/deluge/ui/console/commands/plugin.py @@ -149,10 +149,10 @@ class Command(BaseCommand): client.core.rescan_plugins() except: - self.console.write("{!error!}An error occured, plugin was not installed") + self.console.write("{!error!}An error occurred, plugin was not installed") self.console.write("{!green!}Plugin was successfully installed: %s" % filename) def complete(self, line): - return component.get("ConsoleUI").tab_complete_path(line, ext=".egg", sort="name", dirs_first=-1) \ No newline at end of file + return component.get("ConsoleUI").tab_complete_path(line, ext=".egg", sort="name", dirs_first=-1) diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py index 2865fc082..07633f7e4 100644 --- a/deluge/ui/console/modes/alltorrents.py +++ b/deluge/ui/console/modes/alltorrents.py @@ -592,7 +592,7 @@ class AllTorrents(BaseMode, component.Component): self.stdscr.erase() component.get("ConsoleUI").set_mode(AddTorrents(self,self.stdscr, self.config, self.encoding)) else: - self.messages.append(("Error","An error occured trying to display add torrents screen")) + self.messages.append(("Error","An error occurred trying to display add torrents screen")) component.stop(["AllTorrents"]).addCallback(dodeets) def show_torrent_details(self,tid): @@ -601,7 +601,7 @@ class AllTorrents(BaseMode, component.Component): self.stdscr.erase() component.get("ConsoleUI").set_mode(TorrentDetail(self,tid,self.stdscr, self.config, self.encoding)) else: - self.messages.append(("Error","An error occured trying to display torrent details")) + self.messages.append(("Error","An error occurred trying to display torrent details")) component.stop(["AllTorrents"]).addCallback(dodeets) def show_preferences(self): @@ -617,7 +617,7 @@ class AllTorrents(BaseMode, component.Component): self.stdscr.erase() component.get("ConsoleUI").set_mode(Preferences(self,config,self.config,port,status,self.stdscr,self.encoding)) else: - self.messages.append(("Error","An error occured trying to display preferences")) + self.messages.append(("Error","An error occurred trying to display preferences")) component.stop(["AllTorrents"]).addCallback(doprefs) client.core.get_config().addCallback(_on_get_config) @@ -629,7 +629,7 @@ class AllTorrents(BaseMode, component.Component): self.stdscr.erase() component.get("ConsoleUI").set_mode(EventView(self,self.stdscr,self.encoding)) else: - self.messages.append(("Error","An error occured trying to display events")) + self.messages.append(("Error","An error occurred trying to display events")) component.stop(["AllTorrents"]).addCallback(doevents) def __legacy_mode(self): @@ -640,7 +640,7 @@ class AllTorrents(BaseMode, component.Component): self.legacy_mode.refresh() curses.curs_set(2) else: - self.messages.append(("Error","An error occured trying to switch to legacy mode")) + self.messages.append(("Error","An error occurred trying to switch to legacy mode")) component.stop(["AllTorrents"]).addCallback(dolegacy) def _torrent_filter(self, idx, data): diff --git a/deluge/ui/tracker_icons.py b/deluge/ui/tracker_icons.py index e6b3ee7c1..f46979d5c 100644 --- a/deluge/ui/tracker_icons.py +++ b/deluge/ui/tracker_icons.py @@ -247,7 +247,7 @@ class TrackerIcons(Component): """ Recovers from download error - :param f: the failure that occured + :param f: the failure that occurred :type f: Failure :param host: the name of the host whose page failed to download :type host: string @@ -314,7 +314,7 @@ class TrackerIcons(Component): """ Recovers from a parse error - :param f: the failure that occured + :param f: the failure that occurred :type f: Failure :returns: a Deferred if recovery was possible else the original failure @@ -386,7 +386,7 @@ class TrackerIcons(Component): """ Recovers from a download error - :param f: the failure that occured + :param f: the failure that occurred :type f: Failure :param host: the host the icon failed to download for :type host: string diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py index 4febab156..1d59a6deb 100644 --- a/deluge/ui/web/json_api.py +++ b/deluge/ui/web/json_api.py @@ -242,7 +242,7 @@ class JSON(resource.Resource, component.Component): def _on_rpc_request_failed(self, reason, response, request): """ - Handles any failures that occured while making an rpc call. + Handles any failures that occurred while making an rpc call. """ request.setResponseCode(http.INTERNAL_SERVER_ERROR) return "" @@ -658,7 +658,7 @@ class WebApi(JSONComponent): allow_compression=False) result.addCallbacks(on_download_success, on_download_fail) else: - log.error("Error occured downloading torrent from %s", url) + log.error("Error occurred downloading torrent from %s", url) log.error("Reason: %s", result.getErrorMessage()) return result @@ -871,7 +871,7 @@ class WebApi(JSONComponent): d.addCallback(on_connect, c) d.addErrback(on_connect_failed) except: - main_deferred.callback((False, "An error occured")) + main_deferred.callback((False, "An error occurred")) return main_deferred @export