Module: deluge Branch: master Commit: 50ae65b58a667d1d395d32a25b2826b1cb0a0f09
Author: John Garland <[email protected]> Date: Thu Feb 25 02:01:08 2010 +1100 Use faster (non-regex) version of is_url. --- deluge/common.py | 5 ++--- deluge/plugins/blocklist/blocklist/core.py | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deluge/common.py b/deluge/common.py index cae8222..bbdfd4d 100644 --- a/deluge/common.py +++ b/deluge/common.py @@ -354,7 +354,7 @@ def fdate(seconds): def is_url(url): """ - A simple regex test to check if the URL is valid + A simple test to check if the URL is valid :param url: the url to test :type url: string @@ -367,8 +367,7 @@ def is_url(url): True """ - import re - return bool(re.search('^(https?|ftp|udp)://', url)) + return url.partition('://')[0] in ("http", "https", "ftp", "udp") def is_magnet(uri): """ diff --git a/deluge/plugins/blocklist/blocklist/core.py b/deluge/plugins/blocklist/blocklist/core.py index eb1e3fe..8a556ca 100644 --- a/deluge/plugins/blocklist/blocklist/core.py +++ b/deluge/plugins/blocklist/blocklist/core.py @@ -48,6 +48,7 @@ from deluge.log import LOG as log from deluge.plugins.pluginbase import CorePluginBase import deluge.component as component import deluge.configmanager +from deluge.common import is_url from deluge.core.rpcserver import export from deluge.httpdownloader import download_file from detect import detect_compression, detect_format, create_reader, UnknownFormatError @@ -136,7 +137,7 @@ class Core(CorePluginBase): self.up_to_date = False if force: self.reader = None - self.is_url = self.config["url"].split("://")[0] in ("http", "https") + self.is_url = is_url(self.config["url"]) # Start callback chain if self.is_url: -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
