mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-06 16:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #2338 : Spelling mistake with occurred

Browse source
This commit is contained in:
Calum Lind 2013-06-09 02:30:26 +01:00
commit 3cc43f63a0
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
deluge/core/core.py
View file

@ -277,7 +277,7 @@ class Core(component.Component):
result.addCallbacks(on_download_success, on_download_fail) result.addCallbacks(on_download_success, on_download_fail)
else: else:
# Log the error and pass the failure onto the client # 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()) log.error("Reason: %s", failure.getErrorMessage())
result = failure result = failure
return result return result

20
deluge/plugins/blocklist/blocklist/core.py
View file

@ -163,7 +163,7 @@ class Core(CorePluginBase):
def get_config(self): def get_config(self):
""" """
Returns the config dictionary Returns the config dictionary
:returns: the config dictionary :returns: the config dictionary
:rtype: dict :rtype: dict
""" """
@ -184,7 +184,7 @@ class Core(CorePluginBase):
def get_status(self): def get_status(self):
""" """
Returns the status of the plugin Returns the status of the plugin
:returns: the status dict of the plugin :returns: the status dict of the plugin
:rtype: dict :rtype: dict
""" """
@ -262,7 +262,7 @@ class Core(CorePluginBase):
def on_download_complete(self, blocklist): def on_download_complete(self, blocklist):
""" """
Runs any download clean up functions Runs any download clean up functions
:param blocklist: path of blocklist :param blocklist: path of blocklist
:type blocklist: string :type blocklist: string
:returns: a Deferred which fires when clean up is done :returns: a Deferred which fires when clean up is done
@ -275,8 +275,8 @@ class Core(CorePluginBase):
def on_download_error(self, f): def on_download_error(self, f):
""" """
Recovers from download error Recovers from download error
:param f: failure that occured :param f: failure that occurred
:type f: Failure :type f: Failure
:returns: a Deferred if recovery was possible :returns: a Deferred if recovery was possible
else the original failure else the original failure
@ -311,7 +311,7 @@ class Core(CorePluginBase):
def import_list(self, blocklist): def import_list(self, blocklist):
""" """
Imports the downloaded blocklist into the session Imports the downloaded blocklist into the session
:param blocklist: path of blocklist :param blocklist: path of blocklist
:type blocklist: string :type blocklist: string
:returns: a Deferred that fires when the blocklist has been imported :returns: a Deferred that fires when the blocklist has been imported
@ -335,7 +335,7 @@ class Core(CorePluginBase):
self.is_importing = True self.is_importing = True
self.num_blocked = 0 self.num_blocked = 0
self.blocklist = self.core.session.get_ip_filter() self.blocklist = self.core.session.get_ip_filter()
if not blocklist: if not blocklist:
blocklist = self.filename blocklist = self.filename
@ -353,7 +353,7 @@ class Core(CorePluginBase):
def on_import_complete(self, blocklist): def on_import_complete(self, blocklist):
""" """
Runs any import clean up functions Runs any import clean up functions
:param blocklist: path of blocklist :param blocklist: path of blocklist
:type blocklist: string :type blocklist: string
:returns: a Deferred that fires when clean up is done :returns: a Deferred that fires when clean up is done
@ -376,8 +376,8 @@ class Core(CorePluginBase):
def on_import_error(self, f): def on_import_error(self, f):
""" """
Recovers from import error Recovers from import error
:param f: failure that occured :param f: failure that occurred
:type f: Failure :type f: Failure
:returns: a Deferred if recovery was possible :returns: a Deferred if recovery was possible
else the original failure else the original failure

6
deluge/ui/tracker_icons.py
View file

@ -244,7 +244,7 @@ class TrackerIcons(Component):
""" """
Recovers from download error Recovers from download error
:param f: the failure that occured :param f: the failure that occurred
:type f: Failure :type f: Failure
:param host: the name of the host whose page failed to download :param host: the name of the host whose page failed to download
:type host: string :type host: string
@ -311,7 +311,7 @@ class TrackerIcons(Component):
""" """
Recovers from a parse error Recovers from a parse error
:param f: the failure that occured :param f: the failure that occurred
:type f: Failure :type f: Failure
:returns: a Deferred if recovery was possible :returns: a Deferred if recovery was possible
else the original failure else the original failure
@ -383,7 +383,7 @@ class TrackerIcons(Component):
""" """
Recovers from a download error Recovers from a download error
:param f: the failure that occured :param f: the failure that occurred
:type f: Failure :type f: Failure
:param host: the host the icon failed to download for :param host: the host the icon failed to download for
:type host: string :type host: string

6
deluge/ui/web/json_api.py
View file

@ -242,7 +242,7 @@ class JSON(resource.Resource, component.Component):
def _on_rpc_request_failed(self, reason, response, request): 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) request.setResponseCode(http.INTERNAL_SERVER_ERROR)
return "" return ""
@ -658,7 +658,7 @@ class WebApi(JSONComponent):
allow_compression=False) allow_compression=False)
result.addCallbacks(on_download_success, on_download_fail) result.addCallbacks(on_download_success, on_download_fail)
else: 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()) log.error("Reason: %s", result.getErrorMessage())
return result return result
@ -871,7 +871,7 @@ class WebApi(JSONComponent):
d.addCallback(on_connect, c) d.addCallback(on_connect, c)
d.addErrback(on_connect_failed) d.addErrback(on_connect_failed)
except: except:
main_deferred.callback((False, "An error occured")) main_deferred.callback((False, "An error occurred"))
return main_deferred return main_deferred
@export @export