-
-
-
-
-
-
- -
-
- Active port:%(active_port)s -
- Test active port -
- Unable to reconnect, please restart deluge. - """, -"InvalidUniqueIDError:": - """ - this torrent was removed, - click here to go to the torrent-list - """ -} - - -pretty_errors_cls = { - type(utils.UnknownTorrentError):""" - this torrent was removed, - click here to go to the torrent-list - """ -} - -import sys, urlparse, pprint -from web import websafe -from web import template -import web #import lib.webpy022.webapi as web -import webserver_common as ws -from traceback import format_tb -from deluge import common - -Template = template.Template - -import os, os.path -whereami = os.path.join(os.getcwd(), __file__) -whereami = os.path.sep.join(whereami.split(os.path.sep)[:-1]) -djangoerror_t = """\ -$def with (exception_type, exception_value, frames, exception_message, version_info, tback_txt) - - - - - -
-
- |
- - - Oops, Deluge Broke ...- You might have found a bug, or you did something really stupid ;-). -If the error persists : - Read the Faq. - Try downloading the latest version at - deluge-torrent.org - Visit the forum - or the buglist for more info. - - |
-
-
-$exception_type : $exception_value -
-Paste the contents of this text-box when you are asked for a traceback.
-Try to explain what you where doing, -and how you could work around the problem.
-Don't paste without context and expect us to know what went wrong. -
- - -
-Use a pastebin on IRC!
- - - - -
-
-
--Try to explain what you where doing, -and how you could work around the problem.
-Don't paste without context and expect us to know what went wrong. -
- - -
-Use a pastebin on IRC!
- - - - -
-
-
-Traceback (innermost first)
--
-$for frame in frames:
-
-
-
$frame.filenamein$frame.function- $if frame.context_line: -- $if frame.pre_context: -- - $if frame.vars: --
- $for line in frame.pre_context:
-
- $line -
- $frame.context_line ...
-
- $for line in frame.post_context:
-
- $line -
- ▶ Local vars - $# $inspect.formatargvalues(*inspect.getargvalues(frame['tb'].tb_frame)) -- $:dicttable(frame.vars, kls='vars', id=('v' + str(frame.id))) -
-
-$if ctx.output or ctx.headers:
-
-
-
-
-"""
-
-dicttable_t = r"""$def with (d, kls='req', id=None)
-$if d:
- Response so far
-HEADERS
-
- $for kv in ctx.headers:
- $kv[0]: $kv[1]
- $else:
- [no headers]
-
BODY
-
- $ctx.output
-
Request information
- -INPUT
-$:dicttable(web.input()) - -COOKIES
-$:dicttable(web.cookies()) - -META
-$ newctx = [] -$# ) and (k not in ['env', 'output', 'headers', 'environ', 'status', 'db_execute']): -$for k, v in ctx.iteritems(): - $if not k.startswith('_') and (k in x): - $newctx.append(kv) -$:dicttable(dict(newctx)) - -ENVIRONMENT
-$:dicttable(ctx.env) -| Variable | Value |
|---|---|
| $kv[0] | $prettify(kv[1]) |
No data.
-""" - -dicttable_r = Template(dicttable_t, filter=websafe) -djangoerror_r = Template(djangoerror_t, filter=websafe) - -def djangoerror(): - def _get_lines_from_file(filename, lineno, context_lines): - """ - Returns context_lines before and after lineno from file. - Returns (pre_context_lineno, pre_context, context_line, post_context). - """ - try: - source = open(filename).readlines() - lower_bound = max(0, lineno - context_lines) - upper_bound = lineno + context_lines - - pre_context = \ - [line.strip('\n') for line in source[lower_bound:lineno]] - context_line = source[lineno].strip('\n') - post_context = \ - [line.strip('\n') for line in source[lineno + 1:upper_bound]] - - return lower_bound, pre_context, context_line, post_context - except (OSError, IOError): - return None, [], None, [] - - exception_type, exception_value, tback = sys.exc_info() - - exception_message = 'Error' - try: - exception_message = exception_value.message - except AttributeError: - exception_message = 'no message' - exception_type = exception_type.__name__ - - """ - for err_str in pretty_errors: - if err_str in exception_message: - #from render import render - return render.error(pretty_errors[err_str]) - """ - if exception_type in pretty_errors_cls: - from render import render - return render.error(pretty_errors_cls[exception_type]) - - version_info = "WebUi : %sr%s\nPython %s:" % ( common.get_version() ,common.get_revision(),sys.version) - - tback_txt = ''.join(format_tb(tback)) - - - frames = [] - while tback is not None: - filename = tback.tb_frame.f_code.co_filename - function = tback.tb_frame.f_code.co_name - lineno = tback.tb_lineno - 1 - pre_context_lineno, pre_context, context_line, post_context = \ - _get_lines_from_file(filename, lineno, 7) - frames.append(web.storage({ - 'tback': tback, - 'filename': filename, - 'function': function, - 'lineno': lineno, - 'vars': tback.tb_frame.f_locals, - 'id': id(tback), - 'pre_context': pre_context, - 'context_line': context_line, - 'post_context': post_context, - 'pre_context_lineno': pre_context_lineno, - })) - tback = tback.tb_next - frames.reverse() - urljoin = urlparse.urljoin - def prettify(x): - try: - out = pprint.pformat(x) - except Exception, e: - out = '[could not display: <' + e.__class__.__name__ + \ - ': '+str(e)+'>]' - return out - dt = dicttable_r - dt.globals = {'prettify': prettify} - t = djangoerror_r - t.globals = {'ctx': web.ctx, 'web':web, 'dicttable':dt, 'dict':dict, 'str':str} - return t(exception_type, exception_value, frames, exception_message, version_info, tback_txt) - -def deluge_debugerror(): - """ - A replacement for `internalerror` that presents a nice page with lots - of debug information for the programmer. - - (Based on the beautiful 500 page from [Django](http://djangoproject.com/), - designed by [Wilson Miner](http://wilsonminer.com/).) - """ - web.ctx.headers = [ - ('Content-Type', 'text/html') - ] - web.ctx.output = djangoerror() - -if __name__ == "__main__": - urls = ( - '/', 'index' - ) - - class index: - def GET(self): - thisdoesnotexist - - web.internalerror = web.debugerror - web.run(urls) diff --git a/deluge/ui/webui/deluge_webserver.py b/deluge/ui/webui/deluge_webserver.py deleted file mode 100644 index 0beab9b52..000000000 --- a/deluge/ui/webui/deluge_webserver.py +++ /dev/null @@ -1,135 +0,0 @@ -# -# Copyright (C) Martijn Voncken 2007%s', False, filter) - - def as_ul(self, filter = None): - "Returns this form rendered as HTML
s." - return self._html_output_filtered(u'
%(label)s %(field)s%(help_text)s
', u'%s
', '', u' %s', True, filter) - -class Form(FilteredForm): - info = "" - title = "No Title" - - def __init__(self,data = None): - if data == None: - data = self.initial_data() - newforms.Form.__init__(self,data) - - def initial_data(self): - "override in subclass" - return None - - def start_save(self): - "called by config_page" - data = web.Storage(self.cleaned_data) - self.validate(data) - self.save(data) - self.post_save() - - def save(self, vars): - "override in subclass" - raise NotImplementedError() - - def post_save(self): - pass - - def validate(self, data): - pass - - def pre_html(self): - return '' - - def post_html(self): - return '' - - -#convenience Input Fields. -class CheckBox(newforms.BooleanField): - "Non Required BooleanField,why the f is it required by default?" - def __init__(self,label, **kwargs): - newforms.BooleanField.__init__(self,label=label,required=False,**kwargs) - -class IntChoiceField(newforms.ChoiceField): - """same as ChoiceField, but returns an int - hint : Use IntChoiceField(choices=enumerate("list","of","strings"])) - for index-based values on a list of strings. - """ - def __init__(self, label, choices, **kwargs): - newforms.ChoiceField.__init__(self, label=label, choices=choices,**kwargs) - - def clean(self, value): - return int(newforms.ChoiceField.clean(self, value)) - -class ServerFolder(newforms.CharField): - def __init__(self, label, **kwargs): - newforms.CharField.__init__(self, label=label,**kwargs) - - def clean(self, value): - if value == None: - value = "" - value = value.rstrip('/').rstrip('\\') - self.validate(value) - return newforms.CharField.clean(self, value) - - def validate(self, value): - if (value and not os.path.isdir(value)): - raise newforms.ValidationError(_("This folder does not exist.")) - -class Password(newforms.CharField): - def __init__(self, label, **kwargs): - newforms.CharField.__init__(self, label=label, widget=newforms.PasswordInput, - **kwargs) - -#Lazy multiple select: -class _LazyCheckboxSelectMultiple(newforms.CheckboxSelectMultiple): - """ - choices are not know at define-time - choices_getter returns self.choices. - """ - def __init__(self, attrs=None,choices_getter = None): - self.choices_getter = choices_getter - newforms.CheckboxSelectMultiple.__init__(self,attrs) - - def render(self, name, value, attrs=None, choices=()): - self.choices = self.choices_getter() - return newforms.CheckboxSelectMultiple.render(self, name, value, attrs, choices) - - -class LazyMultipleChoice(newforms.MultipleChoiceField): - """ - choices are not know at define-time - choices_getter returns self.choices. - defaults to non-required. - """ - def __init__(self, label = "",widget=_LazyCheckboxSelectMultiple, - choices_getter = None, **kwargs): - - self.choices_getter = choices_getter - #default to non-required - if not 'required' in kwargs: - kwargs['required'] = False - #init, and pass get_choices to the widget. - newforms.MultipleChoiceField.__init__(self, label=label, - widget=widget(choices_getter=choices_getter),**kwargs) - - def clean(self, value): - self.choices = self.choices_getter() - return newforms.MultipleChoiceField.clean(self, value) - -#Deluge specific: -class _DelugeIntInputWidget(newforms.TextInput): - """ - because deluge-floats are edited as ints. - """ - def render(self, name, value, attrs=None): - try: - value = int(float(value)) - if value == -1 or value == None: - value = _("Unlimited") - except: - pass - return newforms.TextInput.render(self, name, value, attrs) - -class IntegerField(newforms.IntegerField): - def widget_attrs(self, widget): - return {'size': "8"} - -class FloatField(newforms.FloatField): - def widget_attrs(self, widget): - return {'size': "8"} - -class DelugeInt(IntegerField): - def __init__(self, label , **kwargs): - newforms.IntegerField.__init__(self, label=label, min_value=-1, - max_value=sys.maxint, widget=_DelugeIntInputWidget, **kwargs) - - def clean(self, value): - if str(value).lower() == _('Unlimited').lower(): - value = -1 - return int(newforms.IntegerField.clean(self, value)) - -class DelugeFloat(DelugeInt): - def clean(self, value): - try: - value = int(float(value)) #float->int - except: - pass - return float(DelugeInt.clean(self, value)) - - -class StringList(Field): - """for a list of strings """ - def __init__(self, label, *args, **kwargs): - if not "widget" in kwargs: - kwargs["widget"] = StringListWidget - newforms.Field.__init__(self, *args, **kwargs) - - def clean(self, value): - if type(value) in [str, unicode]: #bug - return value.split("/n") - -class StringListWidget(newforms.Textarea): - """for a list of strings """ - def __init__(self, attrs=None): - newforms.Textarea.__init__(self, attrs) - - def render(self, name, value, attrs=None): - if type(value) in [list, tuple]: #bug - value = "\n".join(value) - return newforms.Textarea.render(self, name, value, attrs) - -#/fields - - - - - diff --git a/deluge/ui/webui/lib/newforms_portable/LICENSE b/deluge/ui/webui/lib/newforms_portable/LICENSE deleted file mode 100644 index ba3e68a06..000000000 --- a/deluge/ui/webui/lib/newforms_portable/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2005, the Lawrence Journal-World -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of Django nor the names of its contributors may be used - to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/deluge/ui/webui/lib/newforms_portable/__init__.py b/deluge/ui/webui/lib/newforms_portable/__init__.py deleted file mode 100644 index a34f46c8e..000000000 --- a/deluge/ui/webui/lib/newforms_portable/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -""" -Django validation and HTML form handling. - -TODO: - Default value for field - Field labels - Nestable Forms - FatalValidationError -- short-circuits all other validators on a form - ValidationWarning - "This form field requires foo.js" and form.js_includes() -""" - -from util import ValidationError -from widgets import * -from fields import * -from forms import * -from models import * -import django diff --git a/deluge/ui/webui/lib/newforms_portable/about.txt b/deluge/ui/webui/lib/newforms_portable/about.txt deleted file mode 100644 index 333869ab8..000000000 --- a/deluge/ui/webui/lib/newforms_portable/about.txt +++ /dev/null @@ -1,3 +0,0 @@ -based on django rev.7350 -,/django/ contains the parts of django required to run newforms. - diff --git a/deluge/ui/webui/lib/newforms_portable/django/__init__.py b/deluge/ui/webui/lib/newforms_portable/django/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/deluge/ui/webui/lib/newforms_portable/django/core/__init__.py b/deluge/ui/webui/lib/newforms_portable/django/core/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/deluge/ui/webui/lib/newforms_portable/django/core/exceptions.py b/deluge/ui/webui/lib/newforms_portable/django/core/exceptions.py deleted file mode 100644 index d9fc326cf..000000000 --- a/deluge/ui/webui/lib/newforms_portable/django/core/exceptions.py +++ /dev/null @@ -1,29 +0,0 @@ -"Global Django exceptions" - -class ObjectDoesNotExist(Exception): - "The requested object does not exist" - silent_variable_failure = True - -class MultipleObjectsReturned(Exception): - "The query returned multiple objects when only one was expected." - pass - -class SuspiciousOperation(Exception): - "The user did something suspicious" - pass - -class PermissionDenied(Exception): - "The user did not have permission to do that" - pass - -class ViewDoesNotExist(Exception): - "The requested view does not exist" - pass - -class MiddlewareNotUsed(Exception): - "This middleware is not used in this server configuration" - pass - -class ImproperlyConfigured(Exception): - "Django is somehow improperly configured" - pass diff --git a/deluge/ui/webui/lib/newforms_portable/django/utils/__init__.py b/deluge/ui/webui/lib/newforms_portable/django/utils/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/deluge/ui/webui/lib/newforms_portable/django/utils/datastructures.py b/deluge/ui/webui/lib/newforms_portable/django/utils/datastructures.py deleted file mode 100644 index 4c278c0d8..000000000 --- a/deluge/ui/webui/lib/newforms_portable/django/utils/datastructures.py +++ /dev/null @@ -1,345 +0,0 @@ -class MergeDict(object): - """ - A simple class for creating new "virtual" dictionaries that actually look - up values in more than one dictionary, passed in the constructor. - - If a key appears in more than one of the given dictionaries, only the - first occurrence will be used. - """ - def __init__(self, *dicts): - self.dicts = dicts - - def __getitem__(self, key): - for dict_ in self.dicts: - try: - return dict_[key] - except KeyError: - pass - raise KeyError - - def __copy__(self): - return self.__class__(*self.dicts) - - def get(self, key, default=None): - try: - return self[key] - except KeyError: - return default - - def getlist(self, key): - for dict_ in self.dicts: - if key in dict_.keys(): - return dict_.getlist(key) - return [] - - def items(self): - item_list = [] - for dict_ in self.dicts: - item_list.extend(dict_.items()) - return item_list - - def has_key(self, key): - for dict_ in self.dicts: - if key in dict_: - return True - return False - - __contains__ = has_key - - def copy(self): - """Returns a copy of this object.""" - return self.__copy__() - -class SortedDict(dict): - """ - A dictionary that keeps its keys in the order in which they're inserted. - """ - def __init__(self, data=None): - if data is None: - data = {} - super(SortedDict, self).__init__(data) - if isinstance(data, dict): - self.keyOrder = data.keys() - else: - self.keyOrder = [] - for key, value in data: - if key not in self.keyOrder: - self.keyOrder.append(key) - - def __deepcopy__(self, memo): - from copy import deepcopy - return self.__class__([(key, deepcopy(value, memo)) - for key, value in self.iteritems()]) - - def __setitem__(self, key, value): - super(SortedDict, self).__setitem__(key, value) - if key not in self.keyOrder: - self.keyOrder.append(key) - - def __delitem__(self, key): - super(SortedDict, self).__delitem__(key) - self.keyOrder.remove(key) - - def __iter__(self): - for k in self.keyOrder: - yield k - - def pop(self, k, *args): - result = super(SortedDict, self).pop(k, *args) - try: - self.keyOrder.remove(k) - except ValueError: - # Key wasn't in the dictionary in the first place. No problem. - pass - return result - - def popitem(self): - result = super(SortedDict, self).popitem() - self.keyOrder.remove(result[0]) - return result - - def items(self): - return zip(self.keyOrder, self.values()) - - def iteritems(self): - for key in self.keyOrder: - yield key, super(SortedDict, self).__getitem__(key) - - def keys(self): - return self.keyOrder[:] - - def iterkeys(self): - return iter(self.keyOrder) - - def values(self): - return [super(SortedDict, self).__getitem__(k) for k in self.keyOrder] - - def itervalues(self): - for key in self.keyOrder: - yield super(SortedDict, self).__getitem__(key) - - def update(self, dict_): - for k, v in dict_.items(): - self.__setitem__(k, v) - - def setdefault(self, key, default): - if key not in self.keyOrder: - self.keyOrder.append(key) - return super(SortedDict, self).setdefault(key, default) - - def value_for_index(self, index): - """Returns the value of the item at the given zero-based index.""" - return self[self.keyOrder[index]] - - def insert(self, index, key, value): - """Inserts the key, value pair before the item with the given index.""" - if key in self.keyOrder: - n = self.keyOrder.index(key) - del self.keyOrder[n] - if n < index: - index -= 1 - self.keyOrder.insert(index, key) - super(SortedDict, self).__setitem__(key, value) - - def copy(self): - """Returns a copy of this object.""" - # This way of initializing the copy means it works for subclasses, too. - obj = self.__class__(self) - obj.keyOrder = self.keyOrder[:] - return obj - - def __repr__(self): - """ - Replaces the normal dict.__repr__ with a version that returns the keys - in their sorted order. - """ - return '{%s}' % ', '.join(['%r: %r' % (k, v) for k, v in self.items()]) - - def clear(self): - super(SortedDict, self).clear() - self.keyOrder = [] - -class MultiValueDictKeyError(KeyError): - pass - -class MultiValueDict(dict): - """ - A subclass of dictionary customized to handle multiple values for the - same key. - - >>> d = MultiValueDict({'name': ['Adrian', 'Simon'], 'position': ['Developer']}) - >>> d['name'] - 'Simon' - >>> d.getlist('name') - ['Adrian', 'Simon'] - >>> d.get('lastname', 'nonexistent') - 'nonexistent' - >>> d.setlist('lastname', ['Holovaty', 'Willison']) - - This class exists to solve the irritating problem raised by cgi.parse_qs, - which returns a list for every key, even though most Web forms submit - single name-value pairs. - """ - def __init__(self, key_to_list_mapping=()): - super(MultiValueDict, self).__init__(key_to_list_mapping) - - def __repr__(self): - return "<%s: %s>" % (self.__class__.__name__, - super(MultiValueDict, self).__repr__()) - - def __getitem__(self, key): - """ - Returns the last data value for this key, or [] if it's an empty list; - raises KeyError if not found. - """ - try: - list_ = super(MultiValueDict, self).__getitem__(key) - except KeyError: - raise MultiValueDictKeyError, "Key %r not found in %r" % (key, self) - try: - return list_[-1] - except IndexError: - return [] - - def __setitem__(self, key, value): - super(MultiValueDict, self).__setitem__(key, [value]) - - def __copy__(self): - return self.__class__(super(MultiValueDict, self).items()) - - def __deepcopy__(self, memo=None): - import copy - if memo is None: - memo = {} - result = self.__class__() - memo[id(self)] = result - for key, value in dict.items(self): - dict.__setitem__(result, copy.deepcopy(key, memo), - copy.deepcopy(value, memo)) - return result - - def get(self, key, default=None): - """ - Returns the last data value for the passed key. If key doesn't exist - or value is an empty list, then default is returned. - """ - try: - val = self[key] - except KeyError: - return default - if val == []: - return default - return val - - def getlist(self, key): - """ - Returns the list of values for the passed key. If key doesn't exist, - then an empty list is returned. - """ - try: - return super(MultiValueDict, self).__getitem__(key) - except KeyError: - return [] - - def setlist(self, key, list_): - super(MultiValueDict, self).__setitem__(key, list_) - - def setdefault(self, key, default=None): - if key not in self: - self[key] = default - return self[key] - - def setlistdefault(self, key, default_list=()): - if key not in self: - self.setlist(key, default_list) - return self.getlist(key) - - def appendlist(self, key, value): - """Appends an item to the internal list associated with key.""" - self.setlistdefault(key, []) - super(MultiValueDict, self).__setitem__(key, self.getlist(key) + [value]) - - def items(self): - """ - Returns a list of (key, value) pairs, where value is the last item in - the list associated with the key. - """ - return [(key, self[key]) for key in self.keys()] - - def lists(self): - """Returns a list of (key, list) pairs.""" - return super(MultiValueDict, self).items() - - def values(self): - """Returns a list of the last value on every key list.""" - return [self[key] for key in self.keys()] - - def copy(self): - """Returns a copy of this object.""" - return self.__deepcopy__() - - def update(self, *args, **kwargs): - """ - update() extends rather than replaces existing key lists. - Also accepts keyword args. - """ - if len(args) > 1: - raise TypeError, "update expected at most 1 arguments, got %d" % len(args) - if args: - other_dict = args[0] - if isinstance(other_dict, MultiValueDict): - for key, value_list in other_dict.lists(): - self.setlistdefault(key, []).extend(value_list) - else: - try: - for key, value in other_dict.items(): - self.setlistdefault(key, []).append(value) - except TypeError: - raise ValueError, "MultiValueDict.update() takes either a MultiValueDict or dictionary" - for key, value in kwargs.iteritems(): - self.setlistdefault(key, []).append(value) - -class DotExpandedDict(dict): - """ - A special dictionary constructor that takes a dictionary in which the keys - may contain dots to specify inner dictionaries. It's confusing, but this - example should make sense. - - >>> d = DotExpandedDict({'person.1.firstname': ['Simon'], \ - 'person.1.lastname': ['Willison'], \ - 'person.2.firstname': ['Adrian'], \ - 'person.2.lastname': ['Holovaty']}) - >>> d - {'person': {'1': {'lastname': ['Willison'], 'firstname': ['Simon']}, '2': {'lastname': ['Holovaty'], 'firstname': ['Adrian']}}} - >>> d['person'] - {'1': {'lastname': ['Willison'], 'firstname': ['Simon']}, '2': {'lastname': ['Holovaty'], 'firstname': ['Adrian']}} - >>> d['person']['1'] - {'lastname': ['Willison'], 'firstname': ['Simon']} - - # Gotcha: Results are unpredictable if the dots are "uneven": - >>> DotExpandedDict({'c.1': 2, 'c.2': 3, 'c': 1}) - {'c': 1} - """ - def __init__(self, key_to_list_mapping): - for k, v in key_to_list_mapping.items(): - current = self - bits = k.split('.') - for bit in bits[:-1]: - current = current.setdefault(bit, {}) - # Now assign value to current position - try: - current[bits[-1]] = v - except TypeError: # Special-case if current isn't a dict. - current = {bits[-1]: v} - -class FileDict(dict): - """ - A dictionary used to hold uploaded file contents. The only special feature - here is that repr() of this object won't dump the entire contents of the - file to the output. A handy safeguard for a large file upload. - """ - def __repr__(self): - if 'content' in self: - d = dict(self, content='|<\/i>|<\/b>|<\/em>|<\/strong>|<\/?smallcaps>|<\/?uppercase>)', re.IGNORECASE) -hard_coded_bullets_re = re.compile(r'((?:
(?:%s).*?[a-zA-Z].*?
\s*)+)' % '|'.join([re.escape(x) for x in DOTS]), re.DOTALL) -trailing_empty_content_re = re.compile(r'(?:(?: |\s|
)*?
and
s."""
- value = re.sub(r'\r\n|\r|\n', '\n', force_unicode(value)) # normalize newlines
- paras = re.split('\n{2,}', value)
- if autoescape:
- paras = [u'
%s
' % escape(p.strip()).replace('\n', '') for p in paras] - else: - paras = [u'
%s
' % p.strip().replace('\n', '') for p in paras] - return u'\n\n'.join(paras) -linebreaks = allow_lazy(linebreaks, unicode) - -def strip_tags(value): - """Returns the given HTML with all tags stripped.""" - return re.sub(r'<[^>]*?>', '', force_unicode(value)) -strip_tags = allow_lazy(strip_tags) - -def strip_spaces_between_tags(value): - """Returns the given HTML with spaces between tags removed.""" - return re.sub(r'>\s+<', '><', force_unicode(value)) -strip_spaces_between_tags = allow_lazy(strip_spaces_between_tags, unicode) - -def strip_entities(value): - """Returns the given HTML with all entities (&something;) stripped.""" - return re.sub(r'&(?:\w+|#\d+);', '', force_unicode(value)) -strip_entities = allow_lazy(strip_entities, unicode) - -def fix_ampersands(value): - """Returns the given HTML with all unencoded ampersands encoded correctly.""" - return unencoded_ampersands_re.sub('&', force_unicode(value)) -fix_ampersands = allow_lazy(fix_ampersands, unicode) - -def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False): - """ - Converts any URLs in text into clickable links. - - Works on http://, https://, and www. links. Links can have trailing - punctuation (periods, commas, close-parens) and leading punctuation - (opening parens) and it'll still do the right thing. - - If trim_url_limit is not None, the URLs in link text longer than this limit - will truncated to trim_url_limit-3 characters and appended with an elipsis. - - If nofollow is True, the URLs in link text will get a rel="nofollow" - attribute. - """ - if autoescape: - trim_url = lambda x, limit=trim_url_limit: conditional_escape(limit is not None and (len(x) > limit and ('%s...' % x[:max(0, limit - 3)])) or x) - else: - trim_url = lambda x, limit=trim_url_limit: limit is not None and (len(x) > limit and ('%s...' % x[:max(0, limit - 3)])) or x - safe_input = isinstance(text, SafeData) - words = word_split_re.split(force_unicode(text)) - nofollow_attr = nofollow and ' rel="nofollow"' or '' - for i, word in enumerate(words): - match = punctuation_re.match(word) - if match: - lead, middle, trail = match.groups() - if safe_input: - middle = mark_safe(middle) - if middle.startswith('www.') or ('@' not in middle and not middle.startswith('http://') and \ - len(middle) > 0 and middle[0] in string.ascii_letters + string.digits and \ - (middle.endswith('.org') or middle.endswith('.net') or middle.endswith('.com'))): - middle = 'http://%s' % middle - if middle.startswith('http://') or middle.startswith('https://'): - url = urlquote(middle, safe='/&=:;#?+*') - if autoescape and not safe_input: - url = escape(url) - trimmed_url = trim_url(middle) - middle = '%s' % (url, nofollow_attr, - trimmed_url) - elif '@' in middle and not middle.startswith('www.') and \ - not ':' in middle and simple_email_re.match(middle): - if autoescape: - middle = conditional_escape(middle) - middle = '%s' % (middle, middle) - if lead + middle + trail != word: - if autoescape and not safe_input: - lead, trail = escape(lead), escape(trail) - words[i] = mark_safe('%s%s%s' % (lead, middle, trail)) - elif autoescape and not safe_input: - words[i] = escape(word) - elif safe_input: - words[i] = mark_safe(word) - elif autoescape: - words[i] = escape(word) - return u''.join(words) -urlize = allow_lazy(urlize, unicode) - -def clean_html(text): - """ - Clean the given HTML. Specifically, do the following: - * Convert and to and . - * Encode all ampersands correctly. - * Remove all "target" attributes from tags. - * Remove extraneous HTML, such as presentational tags that open and - immediately close and
. - * Convert hard-coded bullets into HTML unordered lists. - * Remove stuff like "
", but only if it's at the - bottom of the text. - """ - from django.utils.text import normalize_newlines - text = normalize_newlines(force_unicode(text)) - text = re.sub(r'<(/?)\s*b\s*>', '<\\1strong>', text) - text = re.sub(r'<(/?)\s*i\s*>', '<\\1em>', text) - text = fix_ampersands(text) - # Remove all target="" attributes from tags. - text = link_target_attribute_re.sub('\\1', text) - # Trim stupid HTML such as
. - text = html_gunk_re.sub('', text) - # Convert hard-coded bullets into HTML unordered lists. - def replace_p_tags(match): - s = match.group().replace('', '') - for d in DOTS: - s = s.replace('
%s' % d, '
- \n%s\n
", but only if it's at the bottom - # of the text. - text = trailing_empty_content_re.sub('', text) - return text -clean_html = allow_lazy(clean_html, unicode) diff --git a/deluge/ui/webui/lib/newforms_portable/django/utils/http.py b/deluge/ui/webui/lib/newforms_portable/django/utils/http.py deleted file mode 100644 index db8bb9644..000000000 --- a/deluge/ui/webui/lib/newforms_portable/django/utils/http.py +++ /dev/null @@ -1,67 +0,0 @@ -import urllib -from email.Utils import formatdate - -from encoding import smart_str, force_unicode -from functional import allow_lazy - -def urlquote(url, safe='/'): - """ - A version of Python's urllib.quote() function that can operate on unicode - strings. The url is first UTF-8 encoded before quoting. The returned string - can safely be used as part of an argument to a subsequent iri_to_uri() call - without double-quoting occurring. - """ - return force_unicode(urllib.quote(smart_str(url), safe)) - -urlquote = allow_lazy(urlquote, unicode) - -def urlquote_plus(url, safe=''): - """ - A version of Python's urllib.quote_plus() function that can operate on - unicode strings. The url is first UTF-8 encoded before quoting. The - returned string can safely be used as part of an argument to a subsequent - iri_to_uri() call without double-quoting occurring. - """ - return force_unicode(urllib.quote_plus(smart_str(url), safe)) -urlquote_plus = allow_lazy(urlquote_plus, unicode) - -def urlencode(query, doseq=0): - """ - A version of Python's urllib.urlencode() function that can operate on - unicode strings. The parameters are first case to UTF-8 encoded strings and - then encoded as per normal. - """ - if hasattr(query, 'items'): - query = query.items() - return urllib.urlencode( - [(smart_str(k), - isinstance(v, (list,tuple)) and [smart_str(i) for i in v] or smart_str(v)) - for k, v in query], - doseq) - -def cookie_date(epoch_seconds=None): - """ - Formats the time to ensure compatibility with Netscape's cookie standard. - - Accepts a floating point number expressed in seconds since the epoch, in - UTC - such as that outputted by time.time(). If set to None, defaults to - the current time. - - Outputs a string in the format 'Wdy, DD-Mon-YYYY HH:MM:SS GMT'. - """ - rfcdate = formatdate(epoch_seconds) - return '%s-%s-%s GMT' % (rfcdate[:7], rfcdate[8:11], rfcdate[12:25]) - -def http_date(epoch_seconds=None): - """ - Formats the time to match the RFC1123 date format as specified by HTTP - RFC2616 section 3.3.1. - - Accepts a floating point number expressed in seconds since the epoch, in - UTC - such as that outputted by time.time(). If set to None, defaults to - the current time. - - Outputs a string in the format 'Wdy, DD Mon YYYY HH:MM:SS GMT'. - """ - rfcdate = formatdate(epoch_seconds) - return '%s GMT' % rfcdate[:25] diff --git a/deluge/ui/webui/lib/newforms_portable/django/utils/safestring.py b/deluge/ui/webui/lib/newforms_portable/django/utils/safestring.py deleted file mode 100644 index 99658fb8b..000000000 --- a/deluge/ui/webui/lib/newforms_portable/django/utils/safestring.py +++ /dev/null @@ -1,119 +0,0 @@ -""" -Functions for working with "safe strings": strings that can be displayed safely -without further escaping in HTML. Marking something as a "safe string" means -that the producer of the string has already turned characters that should not -be interpreted by the HTML engine (e.g. '<') into the appropriate entities. -""" -from functional import curry, Promise - -class EscapeData(object): - pass - -class EscapeString(str, EscapeData): - """ - A string that should be HTML-escaped when output. - """ - pass - -class EscapeUnicode(unicode, EscapeData): - """ - A unicode object that should be HTML-escaped when output. - """ - pass - -class SafeData(object): - pass - -class SafeString(str, SafeData): - """ - A string subclass that has been specifically marked as "safe" (requires no - further escaping) for HTML output purposes. - """ - def __add__(self, rhs): - """ - Concatenating a safe string with another safe string or safe unicode - object is safe. Otherwise, the result is no longer safe. - """ - t = super(SafeString, self).__add__(rhs) - if isinstance(rhs, SafeUnicode): - return SafeUnicode(t) - elif isinstance(rhs, SafeString): - return SafeString(t) - return t - - def _proxy_method(self, *args, **kwargs): - """ - Wrap a call to a normal unicode method up so that we return safe - results. The method that is being wrapped is passed in the 'method' - argument. - """ - method = kwargs.pop('method') - data = method(self, *args, **kwargs) - if isinstance(data, str): - return SafeString(data) - else: - return SafeUnicode(data) - - decode = curry(_proxy_method, method = str.decode) - -class SafeUnicode(unicode, SafeData): - """ - A unicode subclass that has been specifically marked as "safe" for HTML - output purposes. - """ - def __add__(self, rhs): - """ - Concatenating a safe unicode object with another safe string or safe - unicode object is safe. Otherwise, the result is no longer safe. - """ - t = super(SafeUnicode, self).__add__(rhs) - if isinstance(rhs, SafeData): - return SafeUnicode(t) - return t - - def _proxy_method(self, *args, **kwargs): - """ - Wrap a call to a normal unicode method up so that we return safe - results. The method that is being wrapped is passed in the 'method' - argument. - """ - method = kwargs.pop('method') - data = method(self, *args, **kwargs) - if isinstance(data, str): - return SafeString(data) - else: - return SafeUnicode(data) - - encode = curry(_proxy_method, method = unicode.encode) - -def mark_safe(s): - """ - Explicitly mark a string as safe for (HTML) output purposes. The returned - object can be used everywhere a string or unicode object is appropriate. - - Can be called multiple times on a single string. - """ - if isinstance(s, SafeData): - return s - if isinstance(s, str) or (isinstance(s, Promise) and s._delegate_str): - return SafeString(s) - if isinstance(s, (unicode, Promise)): - return SafeUnicode(s) - return SafeString(str(s)) - -def mark_for_escaping(s): - """ - Explicitly mark a string as requiring HTML escaping upon output. Has no - effect on SafeData subclasses. - - Can be called multiple times on a single string (the resulting escaping is - only applied once). - """ - if isinstance(s, (SafeData, EscapeData)): - return s - if isinstance(s, str) or (isinstance(s, Promise) and s._delegate_str): - return EscapeString(s) - if isinstance(s, (unicode, Promise)): - return EscapeUnicode(s) - return EscapeString(str(s)) - diff --git a/deluge/ui/webui/lib/newforms_portable/django/utils/translation.py b/deluge/ui/webui/lib/newforms_portable/django/utils/translation.py deleted file mode 100644 index ad65bd959..000000000 --- a/deluge/ui/webui/lib/newforms_portable/django/utils/translation.py +++ /dev/null @@ -1,9 +0,0 @@ -try: - _('translate something') -except: - import gettext - gettext.install('locale') - -ugettext = _ -ugettext_lazy = _ - diff --git a/deluge/ui/webui/lib/newforms_portable/fields.py b/deluge/ui/webui/lib/newforms_portable/fields.py deleted file mode 100644 index c20899ada..000000000 --- a/deluge/ui/webui/lib/newforms_portable/fields.py +++ /dev/null @@ -1,784 +0,0 @@ -""" -Field classes. -""" - -import copy -import datetime -import os -import re -import time -# Python 2.3 fallbacks -try: - from decimal import Decimal, DecimalException -except ImportError: - from django.utils._decimal import Decimal, DecimalException -try: - set -except NameError: - from sets import Set as set - -from django.utils.translation import ugettext_lazy as _ -from django.utils.encoding import StrAndUnicode, smart_unicode, smart_str - -from util import ErrorList, ValidationError -from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateTimeInput - - -__all__ = ( - 'Field', 'CharField', 'IntegerField', - 'DEFAULT_DATE_INPUT_FORMATS', 'DateField', - 'DEFAULT_TIME_INPUT_FORMATS', 'TimeField', - 'DEFAULT_DATETIME_INPUT_FORMATS', 'DateTimeField', - 'RegexField', 'EmailField', 'FileField', 'ImageField', 'URLField', - 'BooleanField', 'NullBooleanField', 'ChoiceField', 'MultipleChoiceField', - 'ComboField', 'MultiValueField', 'FloatField', 'DecimalField', - 'SplitDateTimeField', 'IPAddressField', 'FilePathField', -) - -# These values, if given to to_python(), will trigger the self.required check. -EMPTY_VALUES = (None, '') - - -class Field(object): - widget = TextInput # Default widget to use when rendering this type of Field. - hidden_widget = HiddenInput # Default widget to use when rendering this as "hidden". - default_error_messages = { - 'required': _(u'This field is required.'), - 'invalid': _(u'Enter a valid value.'), - } - - # Tracks each time a Field instance is created. Used to retain order. - creation_counter = 0 - - def __init__(self, required=True, widget=None, label=None, initial=None, - help_text=None, error_messages=None): - # required -- Boolean that specifies whether the field is required. - # True by default. - # widget -- A Widget class, or instance of a Widget class, that should - # be used for this Field when displaying it. Each Field has a - # default Widget that it'll use if you don't specify this. In - # most cases, the default widget is TextInput. - # label -- A verbose name for this field, for use in displaying this - # field in a form. By default, Django will use a "pretty" - # version of the form field name, if the Field is part of a - # Form. - # initial -- A value to use in this Field's initial display. This value - # is *not* used as a fallback if data isn't given. - # help_text -- An optional string to use as "help text" for this Field. - if label is not None: - label = smart_unicode(label) - self.required, self.label, self.initial = required, label, initial - self.help_text = smart_unicode(help_text or '') - widget = widget or self.widget - if isinstance(widget, type): - widget = widget() - - # Hook into self.widget_attrs() for any Field-specific HTML attributes. - extra_attrs = self.widget_attrs(widget) - if extra_attrs: - widget.attrs.update(extra_attrs) - - self.widget = widget - - # Increase the creation counter, and save our local copy. - self.creation_counter = Field.creation_counter - Field.creation_counter += 1 - - def set_class_error_messages(messages, klass): - for base_class in klass.__bases__: - set_class_error_messages(messages, base_class) - messages.update(getattr(klass, 'default_error_messages', {})) - - messages = {} - set_class_error_messages(messages, self.__class__) - messages.update(error_messages or {}) - self.error_messages = messages - - def clean(self, value): - """ - Validates the given value and returns its "cleaned" value as an - appropriate Python object. - - Raises ValidationError for any errors. - """ - if self.required and value in EMPTY_VALUES: - raise ValidationError(self.error_messages['required']) - return value - - def widget_attrs(self, widget): - """ - Given a Widget instance (*not* a Widget class), returns a dictionary of - any HTML attributes that should be added to the Widget, based on this - Field. - """ - return {} - - def __deepcopy__(self, memo): - result = copy.copy(self) - memo[id(self)] = result - result.widget = copy.deepcopy(self.widget, memo) - return result - -class CharField(Field): - default_error_messages = { - 'max_length': _(u'Ensure this value has at most %(max)d characters (it has %(length)d).'), - 'min_length': _(u'Ensure this value has at least %(min)d characters (it has %(length)d).'), - } - - def __init__(self, max_length=None, min_length=None, *args, **kwargs): - self.max_length, self.min_length = max_length, min_length - super(CharField, self).__init__(*args, **kwargs) - - def clean(self, value): - "Validates max_length and min_length. Returns a Unicode object." - super(CharField, self).clean(value) - if value in EMPTY_VALUES: - return u'' - value = smart_unicode(value) - value_length = len(value) - if self.max_length is not None and value_length > self.max_length: - raise ValidationError(self.error_messages['max_length'] % {'max': self.max_length, 'length': value_length}) - if self.min_length is not None and value_length < self.min_length: - raise ValidationError(self.error_messages['min_length'] % {'min': self.min_length, 'length': value_length}) - return value - - def widget_attrs(self, widget): - if self.max_length is not None and isinstance(widget, (TextInput, PasswordInput)): - # The HTML attribute is maxlength, not max_length. - return {'maxlength': str(self.max_length)} - -class IntegerField(Field): - default_error_messages = { - 'invalid': _(u'Enter a whole number.'), - 'max_value': _(u'Ensure this value is less than or equal to %s.'), - 'min_value': _(u'Ensure this value is greater than or equal to %s.'), - } - - def __init__(self, max_value=None, min_value=None, *args, **kwargs): - self.max_value, self.min_value = max_value, min_value - super(IntegerField, self).__init__(*args, **kwargs) - - def clean(self, value): - """ - Validates that int() can be called on the input. Returns the result - of int(). Returns None for empty values. - """ - super(IntegerField, self).clean(value) - if value in EMPTY_VALUES: - return None - try: - value = int(str(value)) - except (ValueError, TypeError): - raise ValidationError(self.error_messages['invalid']) - if self.max_value is not None and value > self.max_value: - raise ValidationError(self.error_messages['max_value'] % self.max_value) - if self.min_value is not None and value < self.min_value: - raise ValidationError(self.error_messages['min_value'] % self.min_value) - return value - -class FloatField(Field): - default_error_messages = { - 'invalid': _(u'Enter a number.'), - 'max_value': _(u'Ensure this value is less than or equal to %s.'), - 'min_value': _(u'Ensure this value is greater than or equal to %s.'), - } - - def __init__(self, max_value=None, min_value=None, *args, **kwargs): - self.max_value, self.min_value = max_value, min_value - Field.__init__(self, *args, **kwargs) - - def clean(self, value): - """ - Validates that float() can be called on the input. Returns a float. - Returns None for empty values. - """ - super(FloatField, self).clean(value) - if not self.required and value in EMPTY_VALUES: - return None - try: - value = float(value) - except (ValueError, TypeError): - raise ValidationError(self.error_messages['invalid']) - if self.max_value is not None and value > self.max_value: - raise ValidationError(self.error_messages['max_value'] % self.max_value) - if self.min_value is not None and value < self.min_value: - raise ValidationError(self.error_messages['min_value'] % self.min_value) - return value - -class DecimalField(Field): - default_error_messages = { - 'invalid': _(u'Enter a number.'), - 'max_value': _(u'Ensure this value is less than or equal to %s.'), - 'min_value': _(u'Ensure this value is greater than or equal to %s.'), - 'max_digits': _('Ensure that there are no more than %s digits in total.'), - 'max_decimal_places': _('Ensure that there are no more than %s decimal places.'), - 'max_whole_digits': _('Ensure that there are no more than %s digits before the decimal point.') - } - - def __init__(self, max_value=None, min_value=None, max_digits=None, decimal_places=None, *args, **kwargs): - self.max_value, self.min_value = max_value, min_value - self.max_digits, self.decimal_places = max_digits, decimal_places - Field.__init__(self, *args, **kwargs) - - def clean(self, value): - """ - Validates that the input is a decimal number. Returns a Decimal - instance. Returns None for empty values. Ensures that there are no more - than max_digits in the number, and no more than decimal_places digits - after the decimal point. - """ - super(DecimalField, self).clean(value) - if not self.required and value in EMPTY_VALUES: - return None - value = smart_str(value).strip() - try: - value = Decimal(value) - except DecimalException: - raise ValidationError(self.error_messages['invalid']) - pieces = str(value).lstrip("-").split('.') - decimals = (len(pieces) == 2) and len(pieces[1]) or 0 - digits = len(pieces[0]) - if self.max_value is not None and value > self.max_value: - raise ValidationError(self.error_messages['max_value'] % self.max_value) - if self.min_value is not None and value < self.min_value: - raise ValidationError(self.error_messages['min_value'] % self.min_value) - if self.max_digits is not None and (digits + decimals) > self.max_digits: - raise ValidationError(self.error_messages['max_digits'] % self.max_digits) - if self.decimal_places is not None and decimals > self.decimal_places: - raise ValidationError(self.error_messages['max_decimal_places'] % self.decimal_places) - if self.max_digits is not None and self.decimal_places is not None and digits > (self.max_digits - self.decimal_places): - raise ValidationError(self.error_messages['max_whole_digits'] % (self.max_digits - self.decimal_places)) - return value - -DEFAULT_DATE_INPUT_FORMATS = ( - '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06' - '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006' - '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006' - '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006' - '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006' -) - -class DateField(Field): - default_error_messages = { - 'invalid': _(u'Enter a valid date.'), - } - - def __init__(self, input_formats=None, *args, **kwargs): - super(DateField, self).__init__(*args, **kwargs) - self.input_formats = input_formats or DEFAULT_DATE_INPUT_FORMATS - - def clean(self, value): - """ - Validates that the input can be converted to a date. Returns a Python - datetime.date object. - """ - super(DateField, self).clean(value) - if value in EMPTY_VALUES: - return None - if isinstance(value, datetime.datetime): - return value.date() - if isinstance(value, datetime.date): - return value - for format in self.input_formats: - try: - return datetime.date(*time.strptime(value, format)[:3]) - except ValueError: - continue - raise ValidationError(self.error_messages['invalid']) - -DEFAULT_TIME_INPUT_FORMATS = ( - '%H:%M:%S', # '14:30:59' - '%H:%M', # '14:30' -) - -class TimeField(Field): - default_error_messages = { - 'invalid': _(u'Enter a valid time.') - } - - def __init__(self, input_formats=None, *args, **kwargs): - super(TimeField, self).__init__(*args, **kwargs) - self.input_formats = input_formats or DEFAULT_TIME_INPUT_FORMATS - - def clean(self, value): - """ - Validates that the input can be converted to a time. Returns a Python - datetime.time object. - """ - super(TimeField, self).clean(value) - if value in EMPTY_VALUES: - return None - if isinstance(value, datetime.time): - return value - for format in self.input_formats: - try: - return datetime.time(*time.strptime(value, format)[3:6]) - except ValueError: - continue - raise ValidationError(self.error_messages['invalid']) - -DEFAULT_DATETIME_INPUT_FORMATS = ( - '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59' - '%Y-%m-%d %H:%M', # '2006-10-25 14:30' - '%Y-%m-%d', # '2006-10-25' - '%m/%d/%Y %H:%M:%S', # '10/25/2006 14:30:59' - '%m/%d/%Y %H:%M', # '10/25/2006 14:30' - '%m/%d/%Y', # '10/25/2006' - '%m/%d/%y %H:%M:%S', # '10/25/06 14:30:59' - '%m/%d/%y %H:%M', # '10/25/06 14:30' - '%m/%d/%y', # '10/25/06' -) - -class DateTimeField(Field): - widget = DateTimeInput - default_error_messages = { - 'invalid': _(u'Enter a valid date/time.'), - } - - def __init__(self, input_formats=None, *args, **kwargs): - super(DateTimeField, self).__init__(*args, **kwargs) - self.input_formats = input_formats or DEFAULT_DATETIME_INPUT_FORMATS - - def clean(self, value): - """ - Validates that the input can be converted to a datetime. Returns a - Python datetime.datetime object. - """ - super(DateTimeField, self).clean(value) - if value in EMPTY_VALUES: - return None - if isinstance(value, datetime.datetime): - return value - if isinstance(value, datetime.date): - return datetime.datetime(value.year, value.month, value.day) - if isinstance(value, list): - # Input comes from a SplitDateTimeWidget, for example. So, it's two - # components: date and time. - if len(value) != 2: - raise ValidationError(self.error_messages['invalid']) - value = '%s %s' % tuple(value) - for format in self.input_formats: - try: - return datetime.datetime(*time.strptime(value, format)[:6]) - except ValueError: - continue - raise ValidationError(self.error_messages['invalid']) - -class RegexField(CharField): - def __init__(self, regex, max_length=None, min_length=None, error_message=None, *args, **kwargs): - """ - regex can be either a string or a compiled regular expression object. - error_message is an optional error message to use, if - 'Enter a valid value' is too generic for you. - """ - # error_message is just kept for backwards compatibility: - if error_message: - error_messages = kwargs.get('error_messages') or {} - error_messages['invalid'] = error_message - kwargs['error_messages'] = error_messages - super(RegexField, self).__init__(max_length, min_length, *args, **kwargs) - if isinstance(regex, basestring): - regex = re.compile(regex) - self.regex = regex - - def clean(self, value): - """ - Validates that the input matches the regular expression. Returns a - Unicode object. - """ - value = super(RegexField, self).clean(value) - if value == u'': - return value - if not self.regex.search(value): - raise ValidationError(self.error_messages['invalid']) - return value - -email_re = re.compile( - r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*" # dot-atom - r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string - r')@(?:[A-Z0-9-]+\.)+[A-Z]{2,6}$', re.IGNORECASE) # domain - -class EmailField(RegexField): - default_error_messages = { - 'invalid': _(u'Enter a valid e-mail address.'), - } - - def __init__(self, max_length=None, min_length=None, *args, **kwargs): - RegexField.__init__(self, email_re, max_length, min_length, *args, - **kwargs) - -try: - from django.conf import settings - URL_VALIDATOR_USER_AGENT = settings.URL_VALIDATOR_USER_AGENT -except ImportError: - # It's OK if Django settings aren't configured. - URL_VALIDATOR_USER_AGENT = 'Django (http://www.djangoproject.com/)' - -class UploadedFile(StrAndUnicode): - "A wrapper for files uploaded in a FileField" - def __init__(self, filename, content): - self.filename = filename - self.content = content - - def __unicode__(self): - """ - The unicode representation is the filename, so that the pre-database-insertion - logic can use UploadedFile objects - """ - return self.filename - -class FileField(Field): - widget = FileInput - default_error_messages = { - 'invalid': _(u"No file was submitted. Check the encoding type on the form."), - 'missing': _(u"No file was submitted."), - 'empty': _(u"The submitted file is empty."), - } - - def __init__(self, *args, **kwargs): - super(FileField, self).__init__(*args, **kwargs) - - def clean(self, data, initial=None): - super(FileField, self).clean(initial or data) - if not self.required and data in EMPTY_VALUES: - return None - elif not data and initial: - return initial - try: - f = UploadedFile(data['filename'], data['content']) - except TypeError: - raise ValidationError(self.error_messages['invalid']) - except KeyError: - raise ValidationError(self.error_messages['missing']) - if not f.content: - raise ValidationError(self.error_messages['empty']) - return f - -class ImageField(FileField): - default_error_messages = { - 'invalid_image': _(u"Upload a valid image. The file you uploaded was either not an image or a corrupted image."), - } - - def clean(self, data, initial=None): - """ - Checks that the file-upload field data contains a valid image (GIF, JPG, - PNG, possibly others -- whatever the Python Imaging Library supports). - """ - f = super(ImageField, self).clean(data, initial) - if f is None: - return None - elif not data and initial: - return initial - from PIL import Image - from cStringIO import StringIO - try: - # load() is the only method that can spot a truncated JPEG, - # but it cannot be called sanely after verify() - trial_image = Image.open(StringIO(f.content)) - trial_image.load() - # verify() is the only method that can spot a corrupt PNG, - # but it must be called immediately after the constructor - trial_image = Image.open(StringIO(f.content)) - trial_image.verify() - except Exception: # Python Imaging Library doesn't recognize it as an image - raise ValidationError(self.error_messages['invalid_image']) - return f - -url_re = re.compile( - r'^https?://' # http:// or https:// - r'(?:(?:[A-Z0-9-]+\.)+[A-Z]{2,6}|' #domain... - r'localhost|' #localhost... - r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip - r'(?::\d+)?' # optional port - r'(?:/?|/\S+)$', re.IGNORECASE) - -class URLField(RegexField): - default_error_messages = { - 'invalid': _(u'Enter a valid URL.'), - 'invalid_link': _(u'This URL appears to be a broken link.'), - } - - def __init__(self, max_length=None, min_length=None, verify_exists=False, - validator_user_agent=URL_VALIDATOR_USER_AGENT, *args, **kwargs): - super(URLField, self).__init__(url_re, max_length, min_length, *args, - **kwargs) - self.verify_exists = verify_exists - self.user_agent = validator_user_agent - - def clean(self, value): - # If no URL scheme given, assume http:// - if value and '://' not in value: - value = u'http://%s' % value - value = super(URLField, self).clean(value) - if value == u'': - return value - if self.verify_exists: - import urllib2 - from django.conf import settings - headers = { - "Accept": "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5", - "Accept-Language": "en-us,en;q=0.5", - "Accept-Charset": "ISO-8859-1,utf-8;q=0.7,*;q=0.7", - "Connection": "close", - "User-Agent": self.user_agent, - } - try: - req = urllib2.Request(value, None, headers) - u = urllib2.urlopen(req) - except ValueError: - raise ValidationError(self.error_messages['invalid']) - except: # urllib2.URLError, httplib.InvalidURL, etc. - raise ValidationError(self.error_messages['invalid_link']) - return value - -class BooleanField(Field): - widget = CheckboxInput - - def clean(self, value): - """Returns a Python boolean object.""" - super(BooleanField, self).clean(value) - # Explicitly check for the string 'False', which is what a hidden field - # will submit for False. Because bool("True") == True, we don't need to - # handle that explicitly. - if value == 'False': - return False - return bool(value) - -class NullBooleanField(BooleanField): - """ - A field whose valid values are None, True and False. Invalid values are - cleaned to None. - """ - widget = NullBooleanSelect - - def clean(self, value): - return {True: True, False: False}.get(value, None) - -class ChoiceField(Field): - widget = Select - default_error_messages = { - 'invalid_choice': _(u'Select a valid choice. That choice is not one of the available choices.'), - } - - def __init__(self, choices=(), required=True, widget=None, label=None, - initial=None, help_text=None, *args, **kwargs): - super(ChoiceField, self).__init__(required, widget, label, initial, - help_text, *args, **kwargs) - self.choices = choices - - def _get_choices(self): - return self._choices - - def _set_choices(self, value): - # Setting choices also sets the choices on the widget. - # choices can be any iterable, but we call list() on it because - # it will be consumed more than once. - self._choices = self.widget.choices = list(value) - - choices = property(_get_choices, _set_choices) - - def clean(self, value): - """ - Validates that the input is in self.choices. - """ - value = super(ChoiceField, self).clean(value) - if value in EMPTY_VALUES: - value = u'' - value = smart_unicode(value) - if value == u'': - return value - valid_values = set([smart_unicode(k) for k, v in self.choices]) - if value not in valid_values: - raise ValidationError(self.error_messages['invalid_choice'] % {'value': value}) - return value - -class MultipleChoiceField(ChoiceField): - hidden_widget = MultipleHiddenInput - widget = SelectMultiple - default_error_messages = { - 'invalid_choice': _(u'Select a valid choice. %(value)s is not one of the available choices.'), - 'invalid_list': _(u'Enter a list of values.'), - } - - def clean(self, value): - """ - Validates that the input is a list or tuple. - """ - if self.required and not value: - raise ValidationError(self.error_messages['required']) - elif not self.required and not value: - return [] - if not isinstance(value, (list, tuple)): - raise ValidationError(self.error_messages['invalid_list']) - new_value = [smart_unicode(val) for val in value] - # Validate that each value in the value list is in self.choices. - valid_values = set([smart_unicode(k) for k, v in self.choices]) - for val in new_value: - if val not in valid_values: - raise ValidationError(self.error_messages['invalid_choice'] % {'value': val}) - return new_value - -class ComboField(Field): - """ - A Field whose clean() method calls multiple Field clean() methods. - """ - def __init__(self, fields=(), *args, **kwargs): - super(ComboField, self).__init__(*args, **kwargs) - # Set 'required' to False on the individual fields, because the - # required validation will be handled by ComboField, not by those - # individual fields. - for f in fields: - f.required = False - self.fields = fields - - def clean(self, value): - """ - Validates the given value against all of self.fields, which is a - list of Field instances. - """ - super(ComboField, self).clean(value) - for field in self.fields: - value = field.clean(value) - return value - -class MultiValueField(Field): - """ - A Field that aggregates the logic of multiple Fields. - - Its clean() method takes a "decompressed" list of values, which are then - cleaned into a single value according to self.fields. Each value in - this list is cleaned by the corresponding field -- the first value is - cleaned by the first field, the second value is cleaned by the second - field, etc. Once all fields are cleaned, the list of clean values is - "compressed" into a single value. - - Subclasses should not have to implement clean(). Instead, they must - implement compress(), which takes a list of valid values and returns a - "compressed" version of those values -- a single value. - - You'll probably want to use this with MultiWidget. - """ - default_error_messages = { - 'invalid': _(u'Enter a list of values.'), - } - - def __init__(self, fields=(), *args, **kwargs): - super(MultiValueField, self).__init__(*args, **kwargs) - # Set 'required' to False on the individual fields, because the - # required validation will be handled by MultiValueField, not by those - # individual fields. - for f in fields: - f.required = False - self.fields = fields - - def clean(self, value): - """ - Validates every value in the given list. A value is validated against - the corresponding Field in self.fields. - - For example, if this MultiValueField was instantiated with - fields=(DateField(), TimeField()), clean() would call - DateField.clean(value[0]) and TimeField.clean(value[1]). - """ - cleaned_data = [] - errors = ErrorList() - if not value or isinstance(value, (list, tuple)): - if not value or not [v for v in value if v not in EMPTY_VALUES]: - if self.required: - raise ValidationError(self.error_messages['required']) - else: - return self.compress([]) - else: - raise ValidationError(self.error_messages['invalid']) - for i, field in enumerate(self.fields): - try: - field_value = value[i] - except IndexError: - field_value = None - if self.required and field_value in EMPTY_VALUES: - raise ValidationError(self.error_messages['required']) - try: - cleaned_data.append(field.clean(field_value)) - except ValidationError, e: - # Collect all validation errors in a single list, which we'll - # raise at the end of clean(), rather than raising a single - # exception for the first error we encounter. - errors.extend(e.messages) - if errors: - raise ValidationError(errors) - return self.compress(cleaned_data) - - def compress(self, data_list): - """ - Returns a single value for the given list of values. The values can be - assumed to be valid. - - For example, if this MultiValueField was instantiated with - fields=(DateField(), TimeField()), this might return a datetime - object created by combining the date and time in data_list. - """ - raise NotImplementedError('Subclasses must implement this method.') - -class FilePathField(ChoiceField): - def __init__(self, path, match=None, recursive=False, required=True, - widget=Select, label=None, initial=None, help_text=None, - *args, **kwargs): - self.path, self.match, self.recursive = path, match, recursive - super(FilePathField, self).__init__(choices=(), required=required, - widget=widget, label=label, initial=initial, help_text=help_text, - *args, **kwargs) - self.choices = [] - if self.match is not None: - self.match_re = re.compile(self.match) - if recursive: - for root, dirs, files in os.walk(self.path): - for f in files: - if self.match is None or self.match_re.search(f): - f = os.path.join(root, f) - self.choices.append((f, f.replace(path, "", 1))) - else: - try: - for f in os.listdir(self.path): - full_file = os.path.join(self.path, f) - if os.path.isfile(full_file) and (self.match is None or self.match_re.search(f)): - self.choices.append((full_file, f)) - except OSError: - pass - self.widget.choices = self.choices - -class SplitDateTimeField(MultiValueField): - default_error_messages = { - 'invalid_date': _(u'Enter a valid date.'), - 'invalid_time': _(u'Enter a valid time.'), - } - - def __init__(self, *args, **kwargs): - errors = self.default_error_messages.copy() - if 'error_messages' in kwargs: - errors.update(kwargs['error_messages']) - fields = ( - DateField(error_messages={'invalid': errors['invalid_date']}), - TimeField(error_messages={'invalid': errors['invalid_time']}), - ) - super(SplitDateTimeField, self).__init__(fields, *args, **kwargs) - - def compress(self, data_list): - if data_list: - # Raise a validation error if time or date is empty - # (possible if SplitDateTimeField has required=False). - if data_list[0] in EMPTY_VALUES: - raise ValidationError(self.error_messages['invalid_date']) - if data_list[1] in EMPTY_VALUES: - raise ValidationError(self.error_messages['invalid_time']) - return datetime.datetime.combine(*data_list) - return None - -ipv4_re = re.compile(r'^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}$') - -class IPAddressField(RegexField): - default_error_messages = { - 'invalid': _(u'Enter a valid IPv4 address.'), - } - - def __init__(self, *args, **kwargs): - super(IPAddressField, self).__init__(ipv4_re, *args, **kwargs) diff --git a/deluge/ui/webui/lib/newforms_portable/forms.py b/deluge/ui/webui/lib/newforms_portable/forms.py deleted file mode 100644 index 2c481e47a..000000000 --- a/deluge/ui/webui/lib/newforms_portable/forms.py +++ /dev/null @@ -1,350 +0,0 @@ -""" -Form classes -""" - -from copy import deepcopy - -from django.utils.datastructures import SortedDict -from django.utils.html import escape -from django.utils.encoding import StrAndUnicode, smart_unicode, force_unicode -from django.utils.safestring import mark_safe - -from fields import Field, FileField -from widgets import TextInput, Textarea -from util import flatatt, ErrorDict, ErrorList, ValidationError - -__all__ = ('BaseForm', 'Form') - -NON_FIELD_ERRORS = '__all__' - -def pretty_name(name): - "Converts 'first_name' to 'First name'" - name = name[0].upper() + name[1:] - return name.replace('_', ' ') - -def get_declared_fields(bases, attrs, with_base_fields=True): - """ - Create a list of form field instances from the passed in 'attrs', plus any - similar fields on the base classes (in 'bases'). This is used by both the - Form and ModelForm metclasses. - - If 'with_base_fields' is True, all fields from the bases are used. - Otherwise, only fields in the 'declared_fields' attribute on the bases are - used. The distinction is useful in ModelForm subclassing. - """ - fields = [(field_name, attrs.pop(field_name)) for field_name, obj in attrs.items() if isinstance(obj, Field)] - fields.sort(lambda x, y: cmp(x[1].creation_counter, y[1].creation_counter)) - - # If this class is subclassing another Form, add that Form's fields. - # Note that we loop over the bases in *reverse*. This is necessary in - # order to preserve the correct order of fields. - if with_base_fields: - for base in bases[::-1]: - if hasattr(base, 'base_fields'): - fields = base.base_fields.items() + fields - else: - for base in bases[::-1]: - if hasattr(base, 'declared_fields'): - fields = base.declared_fields.items() + fields - - return SortedDict(fields) - -class DeclarativeFieldsMetaclass(type): - """ - Metaclass that converts Field attributes to a dictionary called - 'base_fields', taking into account parent class 'base_fields' as well. - """ - def __new__(cls, name, bases, attrs): - attrs['base_fields'] = get_declared_fields(bases, attrs) - return type.__new__(cls, name, bases, attrs) - -class BaseForm(StrAndUnicode): - # This is the main implementation of all the Form logic. Note that this - # class is different than Form. See the comments by the Form class for more - # information. Any improvements to the form API should be made to *this* - # class, not to the Form class. - def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, - initial=None, error_class=ErrorList, label_suffix=':'): - self.is_bound = data is not None or files is not None - self.data = data or {} - self.files = files or {} - self.auto_id = auto_id - self.prefix = prefix - self.initial = initial or {} - self.error_class = error_class - self.label_suffix = label_suffix - self._errors = None # Stores the errors after clean() has been called. - - # The base_fields class attribute is the *class-wide* definition of - # fields. Because a particular *instance* of the class might want to - # alter self.fields, we create self.fields here by copying base_fields. - # Instances should always modify self.fields; they should not modify - # self.base_fields. - self.fields = deepcopy(self.base_fields) - - def __unicode__(self): - return self.as_table() - - def __iter__(self): - for name, field in self.fields.items(): - yield BoundField(self, field, name) - - def __getitem__(self, name): - "Returns a BoundField with the given name." - try: - field = self.fields[name] - except KeyError: - raise KeyError('Key %r not found in Form' % name) - return BoundField(self, field, name) - - def _get_errors(self): - "Returns an ErrorDict for the data provided for the form" - if self._errors is None: - self.full_clean() - return self._errors - errors = property(_get_errors) - - def is_valid(self): - """ - Returns True if the form has no errors. Otherwise, False. If errors are - being ignored, returns False. - """ - return self.is_bound and not bool(self.errors) - - def add_prefix(self, field_name): - """ - Returns the field name with a prefix appended, if this Form has a - prefix set. - - Subclasses may wish to override. - """ - return self.prefix and ('%s-%s' % (self.prefix, field_name)) or field_name - - def _html_output(self, normal_row, error_row, row_ender, help_text_html, errors_on_separate_row): - "Helper function for outputting HTML. Used by as_table(), as_ul(), as_p()." - top_errors = self.non_field_errors() # Errors that should be displayed above all fields. - output, hidden_fields = [], [] - for name, field in self.fields.items(): - bf = BoundField(self, field, name) - bf_errors = self.error_class([escape(error) for error in bf.errors]) # Escape and cache in local variable. - if bf.is_hidden: - if bf_errors: - top_errors.extend([u'(Hidden field %s) %s' % (name, force_unicode(e)) for e in bf_errors]) - hidden_fields.append(unicode(bf)) - else: - if errors_on_separate_row and bf_errors: - output.append(error_row % force_unicode(bf_errors)) - if bf.label: - label = escape(force_unicode(bf.label)) - # Only add the suffix if the label does not end in - # punctuation. - if self.label_suffix: - if label[-1] not in ':?.!': - label += self.label_suffix - label = bf.label_tag(label) or '' - else: - label = '' - if field.help_text: - help_text = help_text_html % force_unicode(field.help_text) - else: - help_text = u'' - output.append(normal_row % {'errors': force_unicode(bf_errors), 'label': force_unicode(label), 'field': unicode(bf), 'help_text': help_text}) - if top_errors: - output.insert(0, error_row % force_unicode(top_errors)) - if hidden_fields: # Insert any hidden fields in the last row. - str_hidden = u''.join(hidden_fields) - if output: - last_row = output[-1] - # Chop off the trailing row_ender (e.g. '') and - # insert the hidden fields. - output[-1] = last_row[:-len(row_ender)] + str_hidden + row_ender - else: - # If there aren't any rows in the output, just append the - # hidden fields. - output.append(str_hidden) - return mark_safe(u'\n'.join(output)) - - def as_table(self): - "Returns this form rendered as HTML
%s', False) - - def as_ul(self): - "Returns this form rendered as HTML
s." - return self._html_output(u'
%(label)s %(field)s%(help_text)s
', u'%s', '', u' %s', True) - - def non_field_errors(self): - """ - Returns an ErrorList of errors that aren't associated with a particular - field -- i.e., from Form.clean(). Returns an empty ErrorList if there - are none. - """ - return self.errors.get(NON_FIELD_ERRORS, self.error_class()) - - def full_clean(self): - """ - Cleans all of self.data and populates self._errors and - self.cleaned_data. - """ - self._errors = ErrorDict() - if not self.is_bound: # Stop further processing. - return - self.cleaned_data = {} - for name, field in self.fields.items(): - # value_from_datadict() gets the data from the data dictionaries. - # Each widget type knows how to retrieve its own data, because some - # widgets split data over several HTML fields. - value = field.widget.value_from_datadict(self.data, self.files, self.add_prefix(name)) - try: - if isinstance(field, FileField): - initial = self.initial.get(name, field.initial) - value = field.clean(value, initial) - else: - value = field.clean(value) - self.cleaned_data[name] = value - if hasattr(self, 'clean_%s' % name): - value = getattr(self, 'clean_%s' % name)() - self.cleaned_data[name] = value - except ValidationError, e: - self._errors[name] = e.messages - if name in self.cleaned_data: - del self.cleaned_data[name] - try: - self.cleaned_data = self.clean() - except ValidationError, e: - self._errors[NON_FIELD_ERRORS] = e.messages - if self._errors: - delattr(self, 'cleaned_data') - - def clean(self): - """ - Hook for doing any extra form-wide cleaning after Field.clean() been - called on every field. Any ValidationError raised by this method will - not be associated with a particular field; it will have a special-case - association with the field named '__all__'. - """ - return self.cleaned_data - - def is_multipart(self): - """ - Returns True if the form needs to be multipart-encrypted, i.e. it has - FileInput. Otherwise, False. - """ - for field in self.fields.values(): - if field.widget.needs_multipart_form: - return True - return False - -class Form(BaseForm): - "A collection of Fields, plus their associated data." - # This is a separate class from BaseForm in order to abstract the way - # self.fields is specified. This class (Form) is the one that does the - # fancy metaclass stuff purely for the semantic sugar -- it allows one - # to define a form using declarative syntax. - # BaseForm itself has no way of designating self.fields. - __metaclass__ = DeclarativeFieldsMetaclass - -class BoundField(StrAndUnicode): - "A Field plus data" - def __init__(self, form, field, name): - self.form = form - self.field = field - self.name = name - self.html_name = form.add_prefix(name) - if self.field.label is None: - self.label = pretty_name(name) - else: - self.label = self.field.label - self.help_text = field.help_text or '' - - def __unicode__(self): - """Renders this field as an HTML widget.""" - return self.as_widget() - - def _errors(self): - """ - Returns an ErrorList for this field. Returns an empty ErrorList - if there are none. - """ - return self.form.errors.get(self.name, self.form.error_class()) - errors = property(_errors) - - def as_widget(self, widget=None, attrs=None): - """ - Renders the field by rendering the passed widget, adding any HTML - attributes passed as attrs. If no widget is specified, then the - field's default widget will be used. - """ - if not widget: - widget = self.field.widget - attrs = attrs or {} - auto_id = self.auto_id - if auto_id and 'id' not in attrs and 'id' not in widget.attrs: - attrs['id'] = auto_id - if not self.form.is_bound: - data = self.form.initial.get(self.name, self.field.initial) - if callable(data): - data = data() - else: - data = self.data - return widget.render(self.html_name, data, attrs=attrs) - - def as_text(self, attrs=None): - """ - Returns a string of HTML for representing this as an . - """ - return self.as_widget(TextInput(), attrs) - - def as_textarea(self, attrs=None): - "Returns a string of HTML for representing this as a ' % (flatatt(final_attrs), - conditional_escape(force_unicode(value)))) - -class DateTimeInput(Input): - input_type = 'text' - format = '%Y-%m-%d %H:%M:%S' # '2006-10-25 14:30:59' - - def __init__(self, attrs=None, format=None): - super(DateTimeInput, self).__init__(attrs) - if format: - self.format = format - - def render(self, name, value, attrs=None): - if value is None: - value = '' - elif hasattr(value, 'strftime'): - value = value.strftime(self.format) - return super(DateTimeInput, self).render(name, value, attrs) - -class CheckboxInput(Widget): - def __init__(self, attrs=None, check_test=bool): - super(CheckboxInput, self).__init__(attrs) - # check_test is a callable that takes a value and returns True - # if the checkbox should be checked for that value. - self.check_test = check_test - - def render(self, name, value, attrs=None): - final_attrs = self.build_attrs(attrs, type='checkbox', name=name) - try: - result = self.check_test(value) - except: # Silently catch exceptions - result = False - if result: - final_attrs['checked'] = 'checked' - if value not in ('', True, False, None): - # Only add the 'value' attribute if a value is non-empty. - final_attrs['value'] = force_unicode(value) - return mark_safe(u'- for this set of radio fields."""
- return mark_safe(u'
- %s ' - % force_unicode(w) for w in self])) - -class RadioSelect(Select): - renderer = RadioFieldRenderer - - def __init__(self, *args, **kwargs): - # Override the default renderer if we were passed one. - renderer = kwargs.pop('renderer', None) - if renderer: - self.renderer = renderer - super(RadioSelect, self).__init__(*args, **kwargs) - - def get_renderer(self, name, value, attrs=None, choices=()): - """Returns an instance of the renderer.""" - if value is None: value = '' - str_value = force_unicode(value) # Normalize to string. - final_attrs = self.build_attrs(attrs) - choices = list(chain(self.choices, choices)) - return self.renderer(name, str_value, final_attrs, choices) - - def render(self, name, value, attrs=None, choices=()): - return self.get_renderer(name, value, attrs, choices).render() - - def id_for_label(self, id_): - # RadioSelect is represented by multiple fields, - # each of which has a distinct ID. The IDs are made distinct by a "_X" - # suffix, where X is the zero-based index of the radio field. Thus, - # the label for a RadioSelect should reference the first one ('_0'). - if id_: - id_ += '_0' - return id_ - id_for_label = classmethod(id_for_label) - -class CheckboxSelectMultiple(SelectMultiple): - def render(self, name, value, attrs=None, choices=()): - if value is None: value = [] - has_id = attrs and 'id' in attrs - final_attrs = self.build_attrs(attrs, name=name) - output = [u'
- %s\n' - % (urllib.quote(linkname), cgi.escape(displayname))) - f.write("
-
-
$frame.filenamein$frame.function- $if frame.context_line: -- $if frame.pre_context: -- - $if frame.vars: --
- $for line in frame.pre_context:
-
- $line -
- $frame.context_line ...
-
- $for line in frame.post_context:
-
- $line -
- ▶ Local vars - $# $inspect.formatargvalues(*inspect.getargvalues(frame['tb'].tb_frame)) -- $:dicttable(frame.vars, kls='vars', id=('v' + str(frame.id))) -
-
- \n%s\n
- ']
- # Normalize to strings
- str_values = set([force_unicode(v) for v in value])
- for i, (option_value, option_label) in enumerate(chain(self.choices, choices)):
- # If an ID attribute was given, add a numeric index as a suffix,
- # so that the checkboxes don't all have the same ID attribute.
- if has_id:
- final_attrs = dict(final_attrs, id='%s_%s' % (attrs['id'], i))
- cb = CheckboxInput(final_attrs, check_test=lambda value: value in str_values)
- option_value = force_unicode(option_value)
- rendered_cb = cb.render(name, option_value)
- output.append(u'' % (rendered_cb,
- conditional_escape(force_unicode(option_label))))
- output.append(u'
Directory listing for %s
\n" % displaypath) - f.write("\n
- \n")
- for name in list:
- fullname = os.path.join(path, name)
- displayname = linkname = name
- # Append / for directories or @ for symbolic links
- if os.path.isdir(fullname):
- displayname = name + "/"
- linkname = name + "/"
- if os.path.islink(fullname):
- displayname = name + "@"
- # Note: a link to a directory displays with @ and links with /
- f.write('
\n") - length = f.tell() - f.seek(0) - - web.header("Content-type", "text/html") - web.header("Content-Length", str(length)) - print f.read() - - -if __name__ == '__main__': - #example: - class usr_static(static_handler): - base_dir = os.path.expanduser('~') - - urls = ('/relative/(.*)','static_handler', - '/(.*)','usr_static') - - web.run(urls,globals()) diff --git a/deluge/ui/webui/lib/web.py b/deluge/ui/webui/lib/web.py deleted file mode 100644 index 61ddaf14d..000000000 --- a/deluge/ui/webui/lib/web.py +++ /dev/null @@ -1,2 +0,0 @@ -#compatibility: use the included version/release of web.py. -from webpy022 import * diff --git a/deluge/ui/webui/lib/webpy022/Dependency-not-really part of webui.txt b/deluge/ui/webui/lib/webpy022/Dependency-not-really part of webui.txt deleted file mode 100644 index 54e2330e9..000000000 --- a/deluge/ui/webui/lib/webpy022/Dependency-not-really part of webui.txt +++ /dev/null @@ -1 +0,0 @@ - http://webpy.org/ \ No newline at end of file diff --git a/deluge/ui/webui/lib/webpy022/LICENSE b/deluge/ui/webui/lib/webpy022/LICENSE deleted file mode 100644 index 7ab004b69..000000000 --- a/deluge/ui/webui/lib/webpy022/LICENSE +++ /dev/null @@ -1,3 +0,0 @@ -web.py is public domain. -see : http://webpy.org/ - diff --git a/deluge/ui/webui/lib/webpy022/__init__.py b/deluge/ui/webui/lib/webpy022/__init__.py deleted file mode 100644 index bc8721a0b..000000000 --- a/deluge/ui/webui/lib/webpy022/__init__.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env python -from __future__ import generators - -"""web.py: makes web apps (http://webpy.org)""" -__version__ = "0.22" -__revision__ = "$Rev: 183 $" -__author__ = "Aaron Swartz
-
-
-$exception_type at $ctx.path
-$exception_value
-| Python | -$frames[0].filename in $frames[0].function, line $frames[0].lineno | -
|---|---|
| Web | -$ctx.method $ctx.home$ctx.path | -
-
-
-Traceback (innermost first)
--
-$for frame in frames:
-
-$if ctx.output or ctx.headers:
-
-
-Response so far
-HEADERS
-
- $for kv in ctx.headers:
- $kv[0]: $kv[1]
- $else:
- [no headers]
-
BODY
-
- $ctx.output
-
Request information
- -INPUT
-$:dicttable(web.input()) - -COOKIES
-$:dicttable(web.cookies()) - -META
-$ newctx = [] -$# ) and (k not in ['env', 'output', 'headers', 'environ', 'status', 'db_execute']): -$for k, v in ctx.iteritems(): - $if not k.startswith('_') and (k in x): - $newctx.append(kv) -$:dicttable(dict(newctx)) - -ENVIRONMENT
-$:dicttable(ctx.env) -
-
-
-
-
-"""
-
-dicttable_t = r"""$def with (d, kls='req', id=None)
-$if d:
-
- You're seeing this error because you have web.internalerror
- set to web.debugerror. Change that if you want a different one.
-
| Variable | Value |
|---|---|
| $kv[0] | $prettify(kv[1]) |
No data.
-""" - -dicttable_r = Template(dicttable_t, filter=websafe) -djangoerror_r = Template(djangoerror_t, filter=websafe) - -def djangoerror(): - def _get_lines_from_file(filename, lineno, context_lines): - """ - Returns context_lines before and after lineno from file. - Returns (pre_context_lineno, pre_context, context_line, post_context). - """ - try: - source = open(filename).readlines() - lower_bound = max(0, lineno - context_lines) - upper_bound = lineno + context_lines - - pre_context = \ - [line.strip('\n') for line in source[lower_bound:lineno]] - context_line = source[lineno].strip('\n') - post_context = \ - [line.strip('\n') for line in source[lineno + 1:upper_bound]] - - return lower_bound, pre_context, context_line, post_context - except (OSError, IOError): - return None, [], None, [] - - exception_type, exception_value, tback = sys.exc_info() - frames = [] - while tback is not None: - filename = tback.tb_frame.f_code.co_filename - function = tback.tb_frame.f_code.co_name - lineno = tback.tb_lineno - 1 - pre_context_lineno, pre_context, context_line, post_context = \ - _get_lines_from_file(filename, lineno, 7) - frames.append(web.storage({ - 'tback': tback, - 'filename': filename, - 'function': function, - 'lineno': lineno, - 'vars': tback.tb_frame.f_locals, - 'id': id(tback), - 'pre_context': pre_context, - 'context_line': context_line, - 'post_context': post_context, - 'pre_context_lineno': pre_context_lineno, - })) - tback = tback.tb_next - frames.reverse() - urljoin = urlparse.urljoin - def prettify(x): - try: - out = pprint.pformat(x) - except Exception, e: - out = '[could not display: <' + e.__class__.__name__ + \ - ': '+str(e)+'>]' - return out - dt = dicttable_r - dt.globals = {'prettify': prettify} - t = djangoerror_r - t.globals = {'ctx': web.ctx, 'web':web, 'dicttable':dt, 'dict':dict, 'str':str} - return t(exception_type, exception_value, frames) - -def debugerror(): - """ - A replacement for `internalerror` that presents a nice page with lots - of debug information for the programmer. - - (Based on the beautiful 500 page from [Django](http://djangoproject.com/), - designed by [Wilson Miner](http://wilsonminer.com/).) - """ - - web.ctx.headers = [('Content-Type', 'text/html')] - web.ctx.output = djangoerror() - -if __name__ == "__main__": - urls = ( - '/', 'index' - ) - - class index: - def GET(self): - thisdoesnotexist - - web.internalerror = web.debugerror - web.run(urls) \ No newline at end of file diff --git a/deluge/ui/webui/lib/webpy022/form.py b/deluge/ui/webui/lib/webpy022/form.py deleted file mode 100644 index 498c50ef0..000000000 --- a/deluge/ui/webui/lib/webpy022/form.py +++ /dev/null @@ -1,215 +0,0 @@ -""" -HTML forms -(part of web.py) -""" - -import copy, re -import webapi as web -import utils, net - -def attrget(obj, attr, value=None): - if hasattr(obj, 'has_key') and obj.has_key(attr): return obj[attr] - if hasattr(obj, attr): return getattr(obj, attr) - return value - -class Form: - def __init__(self, *inputs, **kw): - self.inputs = inputs - self.valid = True - self.note = None - self.validators = kw.pop('validators', []) - - def __call__(self, x=None): - o = copy.deepcopy(self) - if x: o.validates(x) - return o - - def render(self): - out = '' - out += self.rendernote(self.note) - out += '| ' % (i.id, i.description) - out += " | "+i.pre+i.render()+i.post+" | " - out += '%s |
|---|
' + net.websafe(result) + ''] - return profile_internal - -if __name__ == "__main__": - import doctest - doctest.testmod() diff --git a/deluge/ui/webui/lib/webpy022/httpserver.py b/deluge/ui/webui/lib/webpy022/httpserver.py deleted file mode 100644 index 6df60b1d8..000000000 --- a/deluge/ui/webui/lib/webpy022/httpserver.py +++ /dev/null @@ -1,227 +0,0 @@ -__all__ = ["runsimple"] - -import sys, os -import webapi as web -import net - -def runbasic(func, server_address=("0.0.0.0", 8080)): - """ - Runs a simple HTTP server hosting WSGI app `func`. The directory `static/` - is hosted statically. - - Based on [WsgiServer][ws] from [Colin Stewart][cs]. - - [ws]: http://www.owlfish.com/software/wsgiutils/documentation/wsgi-server-api.html - [cs]: http://www.owlfish.com/ - """ - # Copyright (c) 2004 Colin Stewart (http://www.owlfish.com/) - # Modified somewhat for simplicity - # Used under the modified BSD license: - # http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5 - - import SimpleHTTPServer, SocketServer, BaseHTTPServer, urlparse - import socket, errno - import traceback - - class WSGIHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): - def run_wsgi_app(self): - protocol, host, path, parameters, query, fragment = \ - urlparse.urlparse('http://dummyhost%s' % self.path) - - # we only use path, query - env = {'wsgi.version': (1, 0) - ,'wsgi.url_scheme': 'http' - ,'wsgi.input': self.rfile - ,'wsgi.errors': sys.stderr - ,'wsgi.multithread': 1 - ,'wsgi.multiprocess': 0 - ,'wsgi.run_once': 0 - ,'REQUEST_METHOD': self.command - ,'REQUEST_URI': self.path - ,'PATH_INFO': path - ,'QUERY_STRING': query - ,'CONTENT_TYPE': self.headers.get('Content-Type', '') - ,'CONTENT_LENGTH': self.headers.get('Content-Length', '') - ,'REMOTE_ADDR': self.client_address[0] - ,'SERVER_NAME': self.server.server_address[0] - ,'SERVER_PORT': str(self.server.server_address[1]) - ,'SERVER_PROTOCOL': self.request_version - } - - for http_header, http_value in self.headers.items(): - env ['HTTP_%s' % http_header.replace('-', '_').upper()] = \ - http_value - - # Setup the state - self.wsgi_sent_headers = 0 - self.wsgi_headers = [] - - try: - # We have there environment, now invoke the application - result = self.server.app(env, self.wsgi_start_response) - try: - try: - for data in result: - if data: - self.wsgi_write_data(data) - finally: - if hasattr(result, 'close'): - result.close() - except socket.error, socket_err: - # Catch common network errors and suppress them - if (socket_err.args[0] in \ - (errno.ECONNABORTED, errno.EPIPE)): - return - except socket.timeout, socket_timeout: - return - except: - print >> web.debug, traceback.format_exc(), - - if (not self.wsgi_sent_headers): - # We must write out something! - self.wsgi_write_data(" ") - return - - do_POST = run_wsgi_app - do_PUT = run_wsgi_app - do_DELETE = run_wsgi_app - - def do_GET(self): - if self.path.startswith('/static/'): - SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) - else: - self.run_wsgi_app() - - def wsgi_start_response(self, response_status, response_headers, - exc_info=None): - if (self.wsgi_sent_headers): - raise Exception \ - ("Headers already sent and start_response called again!") - # Should really take a copy to avoid changes in the application.... - self.wsgi_headers = (response_status, response_headers) - return self.wsgi_write_data - - def wsgi_write_data(self, data): - if (not self.wsgi_sent_headers): - status, headers = self.wsgi_headers - # Need to send header prior to data - status_code = status[:status.find(' ')] - status_msg = status[status.find(' ') + 1:] - self.send_response(int(status_code), status_msg) - for header, value in headers: - self.send_header(header, value) - self.end_headers() - self.wsgi_sent_headers = 1 - # Send the data - self.wfile.write(data) - - class WSGIServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer): - def __init__(self, func, server_address): - BaseHTTPServer.HTTPServer.__init__(self, - server_address, - WSGIHandler) - self.app = func - self.serverShuttingDown = 0 - - print "http://%s:%d/" % server_address - WSGIServer(func, server_address).serve_forever() - -def runsimple(func, server_address=("0.0.0.0", 8080)): - """ - Runs [CherryPy][cp] WSGI server hosting WSGI app `func`. - The directory `static/` is hosted statically. - - [cp]: http://www.cherrypy.org - """ - from wsgiserver import CherryPyWSGIServer - from SimpleHTTPServer import SimpleHTTPRequestHandler - from BaseHTTPServer import BaseHTTPRequestHandler - - class StaticApp(SimpleHTTPRequestHandler): - """WSGI application for serving static files.""" - def __init__(self, environ, start_response): - self.headers = [] - self.environ = environ - self.start_response = start_response - - def send_response(self, status, msg=""): - self.status = str(status) + " " + msg - - def send_header(self, name, value): - self.headers.append((name, value)) - - def end_headers(self): - pass - - def log_message(*a): pass - - def __iter__(self): - environ = self.environ - - self.path = environ.get('PATH_INFO', '') - self.client_address = environ.get('REMOTE_ADDR','-'), \ - environ.get('REMOTE_PORT','-') - self.command = environ.get('REQUEST_METHOD', '-') - - from cStringIO import StringIO - self.wfile = StringIO() # for capturing error - - f = self.send_head() - self.start_response(self.status, self.headers) - - if f: - block_size = 16 * 1024 - while True: - buf = f.read(block_size) - if not buf: - break - yield buf - f.close() - else: - value = self.wfile.getvalue() - yield value - - class WSGIWrapper(BaseHTTPRequestHandler): - """WSGI wrapper for logging the status and serving static files.""" - def __init__(self, app): - self.app = app - self.format = '%s - - [%s] "%s %s %s" - %s' - - def __call__(self, environ, start_response): - def xstart_response(status, response_headers, *args): - write = start_response(status, response_headers, *args) - self.log(status, environ) - return write - - path = environ.get('PATH_INFO', '') - if path.startswith('/static/'): - return StaticApp(environ, xstart_response) - else: - return self.app(environ, xstart_response) - - def log(self, status, environ): - #mvoncken,no logging.. - return - - outfile = environ.get('wsgi.errors', web.debug) - req = environ.get('PATH_INFO', '_') - protocol = environ.get('ACTUAL_SERVER_PROTOCOL', '-') - method = environ.get('REQUEST_METHOD', '-') - host = "%s:%s" % (environ.get('REMOTE_ADDR','-'), - environ.get('REMOTE_PORT','-')) - - #@@ It is really bad to extend from - #@@ BaseHTTPRequestHandler just for this method - time = self.log_date_time_string() - - print >> outfile, self.format % (host, time, protocol, - method, req, status) - - func = WSGIWrapper(func) - server = CherryPyWSGIServer(server_address, func, server_name="localhost") - - print "http://%s:%d/" % server_address - try: - server.start() - except KeyboardInterrupt: - server.stop() diff --git a/deluge/ui/webui/lib/webpy022/net.py b/deluge/ui/webui/lib/webpy022/net.py deleted file mode 100644 index fab23bad8..000000000 --- a/deluge/ui/webui/lib/webpy022/net.py +++ /dev/null @@ -1,155 +0,0 @@ -""" -Network Utilities -(from web.py) -""" - -__all__ = [ - "validipaddr", "validipport", "validip", "validaddr", - "urlquote", - "httpdate", "parsehttpdate", - "htmlquote", "websafe", -] - -import urllib, time -try: import datetime -except ImportError: pass - -def validipaddr(address): - """returns True if `address` is a valid IPv4 address""" - try: - octets = address.split('.') - assert len(octets) == 4 - for x in octets: - assert 0 <= int(x) <= 255 - except (AssertionError, ValueError): - return False - return True - -def validipport(port): - """returns True if `port` is a valid IPv4 port""" - try: - assert 0 <= int(port) <= 65535 - except (AssertionError, ValueError): - return False - return True - -def validip(ip, defaultaddr="0.0.0.0", defaultport=8080): - """returns `(ip_address, port)` from string `ip_addr_port`""" - addr = defaultaddr - port = defaultport - - ip = ip.split(":", 1) - if len(ip) == 1: - if not ip[0]: - pass - elif validipaddr(ip[0]): - addr = ip[0] - elif validipport(ip[0]): - port = int(ip[0]) - else: - raise ValueError, ':'.join(ip) + ' is not a valid IP address/port' - elif len(ip) == 2: - addr, port = ip - if not validipaddr(addr) and validipport(port): - raise ValueError, ':'.join(ip) + ' is not a valid IP address/port' - port = int(port) - else: - raise ValueError, ':'.join(ip) + ' is not a valid IP address/port' - return (addr, port) - -def validaddr(string_): - """ - returns either (ip_address, port) or "/path/to/socket" from string_ - - >>> validaddr('/path/to/socket') - '/path/to/socket' - >>> validaddr('8000') - ('0.0.0.0', 8000) - >>> validaddr('127.0.0.1') - ('127.0.0.1', 8080) - >>> validaddr('127.0.0.1:8000') - ('127.0.0.1', 8000) - >>> validaddr('fff') - Traceback (most recent call last): - ... - ValueError: fff is not a valid IP address/port - """ - if '/' in string_: - return string_ - else: - return validip(string_) - -def urlquote(val): - """ - Quotes a string for use in a URL. - - >>> urlquote('://?f=1&j=1') - '%3A//%3Ff%3D1%26j%3D1' - >>> urlquote(None) - '' - >>> urlquote(u'\u203d') - '%E2%80%BD' - """ - if val is None: return '' - if not isinstance(val, unicode): val = str(val) - else: val = val.encode('utf-8') - return urllib.quote(val) - -def httpdate(date_obj): - """ - Formats a datetime object for use in HTTP headers. - - >>> import datetime - >>> httpdate(datetime.datetime(1970, 1, 1, 1, 1, 1)) - 'Thu, 01 Jan 1970 01:01:01 GMT' - """ - return date_obj.strftime("%a, %d %b %Y %H:%M:%S GMT") - -def parsehttpdate(string_): - """ - Parses an HTTP date into a datetime object. - - >>> parsehttpdate('Thu, 01 Jan 1970 01:01:01 GMT') - datetime.datetime(1970, 1, 1, 1, 1, 1) - """ - try: - t = time.strptime(string_, "%a, %d %b %Y %H:%M:%S %Z") - except ValueError: - return None - return datetime.datetime(*t[:6]) - -def htmlquote(text): - """ - Encodes `text` for raw use in HTML. - - >>> htmlquote("<'&\\">") - '<'&">' - """ - text = text.replace("&", "&") # Must be done first! - text = text.replace("<", "<") - text = text.replace(">", ">") - text = text.replace("'", "'") - text = text.replace('"', """) - return text - -def websafe(val): - """ - Converts `val` so that it's safe for use in UTF-8 HTML. - - >>> websafe("<'&\\">") - '<'&">' - >>> websafe(None) - '' - >>> websafe(u'\u203d') - '\\xe2\\x80\\xbd' - """ - if val is None: - return '' - if isinstance(val, unicode): - val = val.encode('utf-8') - val = str(val) - return htmlquote(val) - -if __name__ == "__main__": - import doctest - doctest.testmod() diff --git a/deluge/ui/webui/lib/webpy022/request.py b/deluge/ui/webui/lib/webpy022/request.py deleted file mode 100644 index 6b20f4d36..000000000 --- a/deluge/ui/webui/lib/webpy022/request.py +++ /dev/null @@ -1,153 +0,0 @@ -""" -Request Delegation -(from web.py) -""" - -__all__ = ["handle", "nomethod", "autodelegate", "webpyfunc", "run"] - -import sys, re, types, os.path, urllib - -import http, wsgi, utils, webapi -import webapi as web - -def handle(mapping, fvars=None): - """ - Call the appropriate function based on the url to function mapping in `mapping`. - If no module for the function is specified, look up the function in `fvars`. If - `fvars` is empty, using the caller's context. - - `mapping` should be a tuple of paired regular expressions with function name - substitutions. `handle` will import modules as necessary. - """ - for url, ofno in utils.group(mapping, 2): - if isinstance(ofno, tuple): - ofn, fna = ofno[0], list(ofno[1:]) - else: - ofn, fna = ofno, [] - fn, result = utils.re_subm('^' + url + '$', ofn, web.ctx.path) - if result: # it's a match - if fn.split(' ', 1)[0] == "redirect": - url = fn.split(' ', 1)[1] - if web.ctx.method == "GET": - x = web.ctx.env.get('QUERY_STRING', '') - if x: - url += '?' + x - return http.redirect(url) - elif '.' in fn: - x = fn.split('.') - mod, cls = '.'.join(x[:-1]), x[-1] - mod = __import__(mod, globals(), locals(), [""]) - cls = getattr(mod, cls) - else: - cls = fn - mod = fvars - if isinstance(mod, types.ModuleType): - mod = vars(mod) - try: - cls = mod[cls] - except KeyError: - return web.notfound() - - meth = web.ctx.method - if meth == "HEAD": - if not hasattr(cls, meth): - meth = "GET" - if not hasattr(cls, meth): - return nomethod(cls) - tocall = getattr(cls(), meth) - args = list(result.groups()) - for d in re.findall(r'\\(\d+)', ofn): - args.pop(int(d) - 1) - return tocall(*([x and urllib.unquote(x) for x in args] + fna)) - - return web.notfound() - -def nomethod(cls): - """Returns a `405 Method Not Allowed` error for `cls`.""" - web.ctx.status = '405 Method Not Allowed' - web.header('Content-Type', 'text/html') - web.header('Allow', \ - ', '.join([method for method in \ - ['GET', 'HEAD', 'POST', 'PUT', 'DELETE'] \ - if hasattr(cls, method)])) - - # commented out for the same reason redirect is - # return output('method not allowed') - -def autodelegate(prefix=''): - """ - Returns a method that takes one argument and calls the method named prefix+arg, - calling `notfound()` if there isn't one. Example: - - urls = ('/prefs/(.*)', 'prefs') - - class prefs: - GET = autodelegate('GET_') - def GET_password(self): pass - def GET_privacy(self): pass - - `GET_password` would get called for `/prefs/password` while `GET_privacy` for - `GET_privacy` gets called for `/prefs/privacy`. - - If a user visits `/prefs/password/change` then `GET_password(self, '/change')` - is called. - """ - def internal(self, arg): - if '/' in arg: - first, rest = arg.split('/', 1) - func = prefix + first - args = ['/' + rest] - else: - func = prefix + arg - args = [] - - if hasattr(self, func): - try: - return getattr(self, func)(*args) - except TypeError: - return web.notfound() - else: - return web.notfound() - return internal - -def webpyfunc(inp, fvars, autoreload=False): - """If `inp` is a url mapping, returns a function that calls handle.""" - if not hasattr(inp, '__call__'): - if autoreload: - def modname(): - """find name of the module name from fvars.""" - file, name = fvars['__file__'], fvars['__name__'] - if name == '__main__': - # Since the __main__ module can't be reloaded, the module has - # to be imported using its file name. - name = os.path.splitext(os.path.basename(file))[0] - return name - - mod = __import__(modname(), None, None, [""]) - #@@probably should replace this with some inspect magic - name = utils.dictfind(fvars, inp) - func = lambda: handle(getattr(mod, name), mod) - else: - func = lambda: handle(inp, fvars) - else: - func = inp - return func - -def run(inp, fvars, *middleware): - """ - Starts handling requests. If called in a CGI or FastCGI context, it will follow - that protocol. If called from the command line, it will start an HTTP - server on the port named in the first command line argument, or, if there - is no argument, on port 8080. - - `input` is a callable, then it's called with no arguments. - Otherwise, it's a `mapping` object to be passed to `handle(...)`. - - **Caveat:** So that `reloader` will work correctly, input has to be a variable, - it can't be a tuple passed in directly. - - `middleware` is a list of WSGI middleware which is applied to the resulting WSGI - function. - """ - autoreload = http.reloader in middleware - return wsgi.runwsgi(webapi.wsgifunc(webpyfunc(inp, fvars, autoreload), *middleware)) diff --git a/deluge/ui/webui/lib/webpy022/template.py b/deluge/ui/webui/lib/webpy022/template.py deleted file mode 100644 index c7c67c758..000000000 --- a/deluge/ui/webui/lib/webpy022/template.py +++ /dev/null @@ -1,878 +0,0 @@ -""" -simple, elegant templating -(part of web.py) -""" - -import re, glob, os, os.path -from types import FunctionType as function -from utils import storage, group, utf8 -from net import websafe - -# differences from python: -# - for: has an optional else: that gets called if the loop never runs -# differences to add: -# - you can use the expression inside if, while blocks -# - special for loop attributes, like django? -# - you can check to see if a variable is defined (perhaps w/ get func?) -# all these are probably good ideas for python... - -# todo: -# inline tuple -# relax constraints on spacing -# continue, break, etc. -# tracebacks - -global_globals = {'None':None, 'False':False, 'True': True} -MAX_ITERS = 100000 - -WHAT = 0 -ARGS = 4 -KWARGS = 6 -NAME = 2 -BODY = 4 -CLAUSE = 2 -ELIF = 6 -ELSE = 8 -IN = 6 -NAME = 2 -EXPR = 4 -FILTER = 4 -THING = 2 -ATTR = 4 -ITEM = 4 -NEGATE = 4 -X = 2 -OP = 4 -Y = 6 -LINENO = -1 - -# http://docs.python.org/ref/identifiers.html -r_var = '[a-zA-Z_][a-zA-Z0-9_]*' - -class ParseError(Exception): pass -class Parser: - def __init__(self, text, name=""): - self.t = text - self.p = 0 - self._lock = [False] - self.name = name - - def lock(self): - self._lock[-1] = True - - def curline(self): - return self.t[:self.p].count('\n')+1 - - def csome(self): - return repr(self.t[self.p:self.p+5]+'...') - - def Error(self, x, y=None): - if y is None: y = self.csome() - raise ParseError, "%s: expected %s, got %s (line %s)" % (self.name, x, y, self.curline()) - - def q(self, f): - def internal(*a, **kw): - checkp = self.p - self._lock.append(False) - try: - q = f(*a, **kw) - except ParseError: - if self._lock[-1]: - raise - self.p = checkp - self._lock.pop() - return False - self._lock.pop() - return q or True - return internal - - def tokr(self, t): - text = self.c(len(t)) - if text != t: - self.Error(repr(t), repr(text)) - return t - - def ltokr(self, *l): - for x in l: - o = self.tokq(x) - if o: return o - self.Error('one of '+repr(l)) - - def rer(self, r): - x = re.match(r, self.t[self.p:]) #@@re_compile - if not x: - self.Error('r'+repr(r)) - return self.tokr(x.group()) - - def endr(self): - if self.p != len(self.t): - self.Error('EOF') - - def c(self, n=1): - out = self.t[self.p:self.p+n] - if out == '' and n != 0: - self.Error('character', 'EOF') - self.p += n - return out - - def lookbehind(self, t): - return self.t[self.p-len(t):self.p] == t - - def __getattr__(self, a): - if a.endswith('q'): - return self.q(getattr(self, a[:-1]+'r')) - raise AttributeError, a - -class TemplateParser(Parser): - def __init__(self, *a, **kw): - Parser.__init__(self, *a, **kw) - self.curws = '' - self.curind = '' - - def o(self, *a): - return a+('lineno', self.curline()) - - def go(self): - # maybe try to do some traceback parsing/hacking - return self.gor() - - def gor(self): - header = self.defwithq() - results = self.lines(start=True) - self.endr() - return header, results - - def ws(self): - n = 0 - while self.tokq(" "): n += 1 - return " " * n - - def defwithr(self): - self.tokr('$def with ') - self.lock() - self.tokr('(') - args = [] - kw = [] - x = self.req(r_var) - while x: - if self.tokq('='): - v = self.exprr() - kw.append((x, v)) - else: - args.append(x) - x = self.tokq(', ') and self.req(r_var) - self.tokr(')\n') - return self.o('defwith', 'null', None, 'args', args, 'kwargs', kw) - - def literalr(self): - o = ( - self.req('"[^"]*"') or #@@ no support for escapes - self.req("'[^']*'") - ) - if o is False: - o = self.req('\-?[0-9]+(\.[0-9]*)?') - if o is not False: - if '.' in o: o = float(o) - else: o = int(o) - - if o is False: self.Error('literal') - return self.o('literal', 'thing', o) - - def listr(self): - self.tokr('[') - self.lock() - x = [] - if not self.tokq(']'): - while True: - t = self.exprr() - x.append(t) - if not self.tokq(', '): break - self.tokr(']') - return self.o('list', 'thing', x) - - def dictr(self): - self.tokr('{') - self.lock() - x = {} - if not self.tokq('}'): - while True: - k = self.exprr() - self.tokr(': ') - v = self.exprr() - x[k] = v - if not self.tokq(', '): break - self.tokr('}') - return self.o('dict', 'thing', x) - - def parenr(self): - self.tokr('(') - self.lock() - o = self.exprr() # todo: allow list - self.tokr(')') - return self.o('paren', 'thing', o) - - def atomr(self): - """returns var, literal, paren, dict, or list""" - o = ( - self.varq() or - self.parenq() or - self.dictq() or - self.listq() or - self.literalq() - ) - if o is False: self.Error('atom') - return o - - def primaryr(self): - """returns getattr, call, or getitem""" - n = self.atomr() - while 1: - if self.tokq('.'): - v = self.req(r_var) - if not v: - self.p -= 1 # get rid of the '.' - break - else: - n = self.o('getattr', 'thing', n, 'attr', v) - elif self.tokq('('): - args = [] - kw = [] - - while 1: - # need to see if we're doing a keyword argument - checkp = self.p - k = self.req(r_var) - if k and self.tokq('='): # yup - v = self.exprr() - kw.append((k, v)) - else: - self.p = checkp - x = self.exprq() - if x: # at least it's something - args.append(x) - else: - break - - if not self.tokq(', '): break - self.tokr(')') - n = self.o('call', 'thing', n, 'args', args, 'kwargs', kw) - elif self.tokq('['): - v = self.exprr() - self.tokr(']') - n = self.o('getitem', 'thing', n, 'item', v) - else: - break - - return n - - def exprr(self): - negate = self.tokq('not ') - x = self.primaryr() - if self.tokq(' '): - operator = self.ltokr('not in', 'in', 'is not', 'is', '==', '!=', '>=', '<=', '<', '>', 'and', 'or', '*', '+', '-', '/', '%') - self.tokr(' ') - y = self.exprr() - x = self.o('test', 'x', x, 'op', operator, 'y', y) - - return self.o('expr', 'thing', x, 'negate', negate) - - def varr(self): - return self.o('var', 'name', self.rer(r_var)) - - def liner(self): - out = [] - o = self.curws - while 1: - c = self.c() - self.lock() - if c == '\n': - self.p -= 1 - break - if c == '$': - if self.lookbehind('\\$'): - o = o[:-1] + c - else: - filter = not bool(self.tokq(':')) - - if self.tokq('{'): - out.append(o) - out.append(self.o('itpl', 'name', self.exprr(), 'filter', filter)) - self.tokr('}') - o = '' - else: - g = self.primaryq() - if g: - out.append(o) - out.append(self.o('itpl', 'name', g, 'filter', filter)) - o = '' - else: - o += c - else: - o += c - self.tokr('\n') - if not self.lookbehind('\\\n'): - o += '\n' - else: - o = o[:-1] - out.append(o) - return self.o('line', 'thing', out) - - def varsetr(self): - self.tokr('$var ') - self.lock() - what = self.rer(r_var) - self.tokr(':') - body = self.lines() - return self.o('varset', 'name', what, 'body', body) - - def ifr(self): - self.tokr("$if ") - self.lock() - expr = self.exprr() - self.tokr(":") - ifc = self.lines() - - elifs = [] - while self.tokq(self.curws + self.curind + '$elif '): - v = self.exprr() - self.tokr(':') - c = self.lines() - elifs.append(self.o('elif', 'clause', v, 'body', c)) - - if self.tokq(self.curws + self.curind + "$else:"): - elsec = self.lines() - else: - elsec = None - - return self.o('if', 'clause', expr, 'then', ifc, 'elif', elifs, 'else', elsec) - - def forr(self): - self.tokr("$for ") - self.lock() - v = self.setabler() - self.tokr(" in ") - g = self.exprr() - self.tokr(":") - l = self.lines() - - if self.tokq(self.curws + self.curind + '$else:'): - elsec = self.lines() - else: - elsec = None - - return self.o('for', 'name', v, 'body', l, 'in', g, 'else', elsec) - - def whiler(self): - self.tokr('$while ') - self.lock() - v = self.exprr() - self.tokr(":") - l = self.lines() - - if self.tokq(self.curws + self.curind + '$else:'): - elsec = self.lines() - else: - elsec = None - - return self.o('while', 'clause', v, 'body', l, 'null', None, 'else', elsec) - - def assignr(self): - self.tokr('$ ') - assign = self.rer(r_var) # NOTE: setable - self.tokr(' = ') - expr = self.exprr() - self.tokr('\n') - - return self.o('assign', 'name', assign, 'expr', expr) - - def commentr(self): - self.tokr('$#') - self.lock() - while self.c() != '\n': pass - return self.o('comment') - - def setabler(self): - out = [self.varr()] #@@ not quite right - while self.tokq(', '): - out.append(self.varr()) - return out - - def lines(self, start=False): - """ - This function gets called from two places: - 1. at the start, where it's matching the document itself - 2. after any command, where it matches one line or an indented block - """ - o = [] - if not start: # try to match just one line - singleline = self.tokq(' ') and self.lineq() - if singleline: - return [singleline] - else: - self.rer(' *') #@@slurp space? - self.tokr('\n') - oldind = self.curind - self.curind += ' ' - while 1: - oldws = self.curws - t = self.tokq(oldws + self.curind) - if not t: break - - self.curws += self.ws() - x = t and ( - self.varsetq() or - self.ifq() or - self.forq() or - self.whileq() or - self.assignq() or - self.commentq() or - self.lineq()) - self.curws = oldws - if not x: - break - elif x[WHAT] == 'comment': - pass - else: - o.append(x) - - if not start: self.curind = oldind - return o - -class Stowage(storage): - def __str__(self): return self.get('_str') - #@@ edits in place - def __add__(self, other): - if isinstance(other, (unicode, str)): - self._str += other - return self - else: - raise TypeError, 'cannot add' - def __radd__(self, other): - if isinstance(other, (unicode, str)): - self._str = other + self._str - return self - else: - raise TypeError, 'cannot add' - -class WTF(AssertionError): pass -class SecurityError(Exception): - """The template seems to be trying to do something naughty.""" - pass - - - - -Required = object() -class Template: - globals = {} - content_types = { - '.html' : 'text/html; charset=utf-8', - '.txt' : 'text/plain', - } - - def __init__(self, text, filter=None, filename=""): - self.filter = filter - self.filename = filename - # universal newlines: - text = text.replace('\r\n', '\n').replace('\r', '\n').expandtabs() - if not text.endswith('\n'): text += '\n' - header, tree = TemplateParser(text, filename).go() - self.tree = tree - if header: - self.h_defwith(header) - else: - self.args, self.kwargs = (), {} - - def __call__(self, *a, **kw): - d = self.globals.copy() - d.update(self._parseargs(a, kw)) - f = Fill(self.tree, d=d) - if self.filter: f.filter = self.filter - - import webapi as web - if 'headers' in web.ctx and self.filename: - content_type = self.find_content_type() - if content_type: - web.header('Content-Type', content_type, unique=True) - - return f.go() - - def find_content_type(self): - for ext, content_type in self.content_types.iteritems(): - if self.filename.endswith(ext): - return content_type - - def _parseargs(self, inargs, inkwargs): - # difference from Python: - # no error on setting a keyword arg twice - d = {} - for arg in self.args: - d[arg] = Required - for kw, val in self.kwargs: - d[kw] = val - - for n, val in enumerate(inargs): - if n < len(self.args): - d[self.args[n]] = val - elif n < len(self.args)+len(self.kwargs): - kw = self.kwargs[n - len(self.args)][0] - d[kw] = val - - for kw, val in inkwargs.iteritems(): - d[kw] = val - - unset = [] - for k, v in d.iteritems(): - if v is Required: - unset.append(k) - if unset: - raise TypeError, 'values for %s are required' % unset - - return d - - def h_defwith(self, header): - assert header[WHAT] == 'defwith' - f = Fill(self.tree, d={}) - - self.args = header[ARGS] - self.kwargs = [] - for var, valexpr in header[KWARGS]: - self.kwargs.append((var, f.h(valexpr))) - - def __repr__(self): - return "
-
- Loading...
-
-
-
-
diff --git a/deluge/ui/webui/templates/ajax/meta.cfg b/deluge/ui/webui/templates/ajax/meta.cfg
deleted file mode 100644
index 3f5cc7a20..000000000
--- a/deluge/ui/webui/templates/ajax/meta.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- 'authors':['Damien Churchill
-
-
- Deluge
- AJAX UI (alpha)
-
-
-
-
- -
-
-
-
-
- - $_('No Incoming Connections!') - - - -
- diff --git a/deluge/ui/webui/templates/ajax/render/html/create_torrent_options.html b/deluge/ui/webui/templates/ajax/render/html/create_torrent_options.html deleted file mode 100644 index f1c49c530..000000000 --- a/deluge/ui/webui/templates/ajax/render/html/create_torrent_options.html +++ /dev/null @@ -1,21 +0,0 @@ - diff --git a/deluge/ui/webui/templates/ajax/render/html/create_torrent_trackers.html b/deluge/ui/webui/templates/ajax/render/html/create_torrent_trackers.html deleted file mode 100644 index 0a1bceac7..000000000 --- a/deluge/ui/webui/templates/ajax/render/html/create_torrent_trackers.html +++ /dev/null @@ -1,17 +0,0 @@ -
-
-
-
-
-| Tier | -Tracker | -
|---|
-
-
-
-
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/create_torrent_webseeds.html b/deluge/ui/webui/templates/ajax/render/html/create_torrent_webseeds.html
deleted file mode 100644
index c39e4be72..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/create_torrent_webseeds.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/preferences_bandwidth.html b/deluge/ui/webui/templates/ajax/render/html/preferences_bandwidth.html
deleted file mode 100644
index b00118e78..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/preferences_bandwidth.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/preferences_daemon.html b/deluge/ui/webui/templates/ajax/render/html/preferences_daemon.html
deleted file mode 100644
index ed0a8ab91..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/preferences_daemon.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/preferences_download.html b/deluge/ui/webui/templates/ajax/render/html/preferences_download.html
deleted file mode 100644
index 6a7017f48..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/preferences_download.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/preferences_network.html b/deluge/ui/webui/templates/ajax/render/html/preferences_network.html
deleted file mode 100644
index 7378c87c3..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/preferences_network.html
+++ /dev/null
@@ -1,94 +0,0 @@
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/preferences_queue.html b/deluge/ui/webui/templates/ajax/render/html/preferences_queue.html
deleted file mode 100644
index db1be97ac..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/preferences_queue.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/preferences_webui.html b/deluge/ui/webui/templates/ajax/render/html/preferences_webui.html
deleted file mode 100644
index e72f6e125..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/preferences_webui.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/tab_details.html b/deluge/ui/webui/templates/ajax/render/html/tab_details.html
deleted file mode 100644
index b9f62b43e..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/tab_details.html
+++ /dev/null
@@ -1,10 +0,0 @@
--
-
- $_('Name'): -
- $_('Hash'): -
- $_('Path'): -
- $_('Total Size'): -
- $_('# of files'): -
- $_('Status'): -
- $_('Tracker'): -
diff --git a/deluge/ui/webui/templates/ajax/render/html/tab_files.html b/deluge/ui/webui/templates/ajax/render/html/tab_files.html deleted file mode 100644 index d412c2ba9..000000000 --- a/deluge/ui/webui/templates/ajax/render/html/tab_files.html +++ /dev/null @@ -1,13 +0,0 @@ -
-
-
-
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/tab_options.html b/deluge/ui/webui/templates/ajax/render/html/tab_options.html
deleted file mode 100644
index 1e69b4e85..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/tab_options.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-| $_('Filename') | -$_('Size') | -$_('Progress') | -$_('Priority') | -
|---|
diff --git a/deluge/ui/webui/templates/ajax/render/html/tab_peers.html b/deluge/ui/webui/templates/ajax/render/html/tab_peers.html deleted file mode 100644 index f800793cd..000000000 --- a/deluge/ui/webui/templates/ajax/render/html/tab_peers.html +++ /dev/null @@ -1,14 +0,0 @@ -
-
-
-
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/tab_statistics.html b/deluge/ui/webui/templates/ajax/render/html/tab_statistics.html
deleted file mode 100644
index 9a6871738..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/tab_statistics.html
+++ /dev/null
@@ -1,25 +0,0 @@
-| - | $_('Address') | -$_('Client') | -$_('Down Speed') | -$_('Up Speed') | -
|---|
-
-
- $_('Downloaded'): -
- $_('Uploaded'): - -
- $_('Next Announce'): -
- $_('Tracker Status'): -
-
-
- $_('Speed'): -
- $_('Speed'): -
- $_('ETA'): -
- $_('Pieces'): -
-
-
- $_('Seeders'): -
- $_('Peers'): -
- $_('Availability'): -
- $_('Auto Managed'): -
-
-
- $_('Active Time'): -
- $_('Seeding Time'): -
- $_('Seed Rank'): -
diff --git a/deluge/ui/webui/templates/ajax/render/html/window_add_torrent.html b/deluge/ui/webui/templates/ajax/render/html/window_add_torrent.html deleted file mode 100644 index 78b3937b2..000000000 --- a/deluge/ui/webui/templates/ajax/render/html/window_add_torrent.html +++ /dev/null @@ -1,13 +0,0 @@ -
$_('Torrents')
- -
-
-
-
-
-
-
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/window_add_torrent_file.html b/deluge/ui/webui/templates/ajax/render/html/window_add_torrent_file.html
deleted file mode 100644
index 50cecf2a8..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/window_add_torrent_file.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/window_create_torrent.html b/deluge/ui/webui/templates/ajax/render/html/window_create_torrent.html
deleted file mode 100644
index 653cdb35a..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/window_create_torrent.html
+++ /dev/null
@@ -1,14 +0,0 @@
-Files
-
-
-
-
-
-
diff --git a/deluge/ui/webui/templates/ajax/render/html/window_preferences.html b/deluge/ui/webui/templates/ajax/render/html/window_preferences.html
deleted file mode 100644
index 986ea6d3c..000000000
--- a/deluge/ui/webui/templates/ajax/render/html/window_preferences.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
diff --git a/deluge/ui/webui/templates/ajax/static/css/Roar.css b/deluge/ui/webui/templates/ajax/static/css/Roar.css
deleted file mode 100644
index efa6f539d..000000000
--- a/deluge/ui/webui/templates/ajax/static/css/Roar.css
+++ /dev/null
@@ -1,55 +0,0 @@
-.roar-body
-{
- position: absolute;
- font: 12px/14px "Lucida Grande", Arial, Helvetica, Verdana, sans-serif;
- color: #fff;
- text-align: left;
- z-index: 999;
-}
-
-.roar
-{
- position: absolute;
- width: 300px;
- cursor: pointer;
-}
-.roar-bg
-{
- position: absolute;
- z-index: 1000;
- width: 100%;
- height: 100%;
- left: 0;
- top: 0;
- background-color: #000;
- -moz-border-radius: 10px;
- -webkit-border-radius: 5px;
- -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.5);
-}
-.roar-body-ugly .roar
-{
- background-color: #333;
-}
-.roar-body-ugly .roar-bg
-{
- display: none;
-}
-.roar h3
-{
- position: relative;
- padding: 15px 10px 0;
- margin: 0;
- border: 0;
- font-size: 13px;
- color: #fff;
- z-index: 1002;
-}
-.roar p
-{
- position: relative;
- padding: 10px 10px 15px;
- margin: 0;
- font-size: 12px;
- color: #fff;
- z-index: 1002;
-}
\ No newline at end of file
diff --git a/deluge/ui/webui/templates/ajax/static/css/mooui.css b/deluge/ui/webui/templates/ajax/static/css/mooui.css
deleted file mode 100644
index 5385666e9..000000000
--- a/deluge/ui/webui/templates/ajax/static/css/mooui.css
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Stylesheet: Widgets.PopupMenu.css
- *
- * Depends: []
- */
-
-ul.moouiMenu {
- position: absolute;
- z-index: 1000;
- padding: 0;
-}
-
-ul.moouiMenu li {
- position: relative;
- list-style: none;
- margin: 1px;
- padding-left: 2px;
- padding-right: 10px;
- line-height: 20px;
- height: 20px;
- background: no-repeat 2px;
-}
-
-ul.moouiMenu li.moouiMenuIcon {
- padding-left: 20px;
-}
-
-ul.moouiMenu li.moouiMenuSep {
- height: 1px;
- line-height: 1px;
-}
-
-ul.moouiMenu li.moouiMenuToggle input {
- cursor: pointer;
-}
-
-ul.moouiMenu li.moouiMenuToggle span span {
- position: relative;
- top: -3px;
-}
-
-ul.moouiMenu li > ul {
- display: none;
- position: relative;
- top: -20px;
- width: 400px;
-}
-
-ul.moouiMenu li:hover {
- cursor: pointer;
-}
-
-ul.moouiMenu li:hover > ul {
- display: block;
-}
-
-ul.moouiMenu li.moouiMenuSep:hover {
- cursor: default;
-}
-
-/*
- * Stylesheet: Widgets.ProgressBar.css
- *
- * Depends: []
- */
-
-.moouiProgressBar span {
- text-align: center;
- float: left;
-}
-
-/*
- * Stylesheet: Widgets.SplitPane.css
- *
- * Depends: []
- */
-
-.moouiPane {
- float: left;
- position: relative;
-}
-
-.moouiSplitter {
- position: relative;
- float: left;
- background: Gray;
-}
-
-.moouiSplitterVertical {
- cursor: e-resize;
-}
-
-.moouiSplitterHorizontal {
- cursor: n-resize;
-}
-
-/*
- * Stylesheet: Widgets.SplitPane.css
- *
- * Depends: []
- */
-
-.moouiTabs ul {
- list-style: none;
- padding: 0;
- margin: 0;
-}
-
-.moouiTabs li {
- float: left;
- padding: 4px;
- cursor: pointer;
- height: 14px;
- -moz-border-radius: 5px 5px 0 0;
- -webkit-border-radius: 5px 5px 0 0;
-}
-
-.moouiTabs .moouiTabPages {
- clear: left;
-}
-
-.moouiTabPage {
- display: none;
-}
-
-.moouiTabPageActive {
- display: block;
-}
-
-/*
- * Stylesheet: Widgets.Window.css
- *
- * Depends: []
- */
-
-.moouiWindow {
- position: fixed;
- top: 0px;
- left: 200px;
- z-index: 100;
-}
-
-.moouiWindowTitle {
- margin: 10px;
- cursor: pointer;
- float: left;
-}
-
-.moouiWindowClose {
- float: right;
- width: 16px;
- height: 16px;
- margin: 5px;
- cursor: pointer;
-}
-
-.moouiWindowContent {
- clear: both;
- padding: 5px;
-}
\ No newline at end of file
diff --git a/deluge/ui/webui/templates/ajax/static/icons/16/gtk-edit.png b/deluge/ui/webui/templates/ajax/static/icons/16/gtk-edit.png
deleted file mode 100644
index 0947dbfb4..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/16/gtk-edit.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/16/gtk-yes.png b/deluge/ui/webui/templates/ajax/static/icons/16/gtk-yes.png
deleted file mode 100644
index addab095f..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/16/gtk-yes.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/16/network-idle.png b/deluge/ui/webui/templates/ajax/static/icons/16/network-idle.png
deleted file mode 100644
index 2911e0cdc..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/16/network-idle.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/16/view-refresh.png b/deluge/ui/webui/templates/ajax/static/icons/16/view-refresh.png
deleted file mode 100644
index 86b6f82c1..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/16/view-refresh.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-ascending.png b/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-ascending.png
deleted file mode 100644
index c199438d8..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-ascending.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-descending.png b/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-descending.png
deleted file mode 100644
index 7ae855acd..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-descending.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/add.png b/deluge/ui/webui/templates/ajax/static/icons/32/add.png
deleted file mode 100644
index 2be63d7db..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/add.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/connections.png b/deluge/ui/webui/templates/ajax/static/icons/32/connections.png
deleted file mode 100644
index 2855e74f8..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/connections.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/deluge.png b/deluge/ui/webui/templates/ajax/static/icons/32/deluge.png
deleted file mode 100644
index 2d272f2ea..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/deluge.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/down.png b/deluge/ui/webui/templates/ajax/static/icons/32/down.png
deleted file mode 100644
index 7c9274f30..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/down.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/new.png b/deluge/ui/webui/templates/ajax/static/icons/32/new.png
deleted file mode 100644
index 3d0f5cc1d..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/new.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/options.png b/deluge/ui/webui/templates/ajax/static/icons/32/options.png
deleted file mode 100644
index 2afbd23cc..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/options.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/pause.png b/deluge/ui/webui/templates/ajax/static/icons/32/pause.png
deleted file mode 100644
index 5c7d128ee..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/pause.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/remove.png b/deluge/ui/webui/templates/ajax/static/icons/32/remove.png
deleted file mode 100644
index 81b5e45ff..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/remove.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/resume.png b/deluge/ui/webui/templates/ajax/static/icons/32/resume.png
deleted file mode 100644
index 71906857c..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/resume.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/up.png b/deluge/ui/webui/templates/ajax/static/icons/32/up.png
deleted file mode 100644
index 2da61b945..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/up.png and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/images/spacer.gif b/deluge/ui/webui/templates/ajax/static/images/spacer.gif
deleted file mode 100644
index 91ee09790..000000000
Binary files a/deluge/ui/webui/templates/ajax/static/images/spacer.gif and /dev/null differ
diff --git a/deluge/ui/webui/templates/ajax/static/js/Roar.js b/deluge/ui/webui/templates/ajax/static/js/Roar.js
deleted file mode 100644
index 78580f8c0..000000000
--- a/deluge/ui/webui/templates/ajax/static/js/Roar.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Roar - Notifications
- *
- * Inspired by Growl
- *
- * @version 1.0.1
- *
- * @license MIT-style license
- * @author Harald Kirschner
-
- $_('Categories')
--
-
-
-
-
-
-
-Authors: $render.meta.authors
-Inherits: $render.meta.inherits
-Comment: $render.meta.comment - -
-*and all other authors/helpers/contributors I forgot to mention
-
-$:render.footer()
diff --git a/deluge/ui/webui/templates/classic/admin_toolbar.html b/deluge/ui/webui/templates/classic/admin_toolbar.html
deleted file mode 100644
index 808ff5e21..000000000
--- a/deluge/ui/webui/templates/classic/admin_toolbar.html
+++ /dev/null
@@ -1 +0,0 @@
-$def with (active_tab)
diff --git a/deluge/ui/webui/templates/classic/authors.txt b/deluge/ui/webui/templates/classic/authors.txt
deleted file mode 100644
index 878772037..000000000
--- a/deluge/ui/webui/templates/classic/authors.txt
+++ /dev/null
@@ -1,5 +0,0 @@
--first layout taken from deluge website
-improved by:
--mvoncken
--somedude
-
diff --git a/deluge/ui/webui/templates/classic/config.html b/deluge/ui/webui/templates/classic/config.html
deleted file mode 100644
index c09b30145..000000000
--- a/deluge/ui/webui/templates/classic/config.html
+++ /dev/null
@@ -1,46 +0,0 @@
-$def with (groups, pages, form, selected, message, error)
-
-$:render.header(_("Config"), 'config')
-
-$:render.admin_toolbar('config')
-
-Version
-$(version)r$rev- -
Template
-Name: $get_config('template')-Authors: $render.meta.authors
-Inherits: $render.meta.inherits
-Comment: $render.meta.comment - -
Links
--
-
- Deluge -
- - WebUi forum Thread - - -
- GPL v3 - -
Authors
--
-
- Martijn Voncken -
- Marcos Pinto -
- Andrew Resch -
- Sadrul Habib Chowdhury -
- Ido Abramovich -
WebUi
--
-
Deluge
--
-
Console UI
--
-
-$for group in groups:
-
-
-$id_to_label(group)
--
- $for page in pages:
- $if pages[page].group == group:
- $if page == selected:
-
- $pages[page].title - $else: -
- $pages[page].title -
-
-$:render.footer()
diff --git a/deluge/ui/webui/templates/classic/connect.html b/deluge/ui/webui/templates/classic/connect.html
deleted file mode 100644
index b4e992305..000000000
--- a/deluge/ui/webui/templates/classic/connect.html
+++ /dev/null
@@ -1,58 +0,0 @@
-$def with (connect_list, connected, restart)
-
-$:render.header(_("Connect to Daemon"), 'connect')
-
-$:render.admin_toolbar('connect')
-
-$id_to_label(form.group) / $form.title
-$form.info
-
-
-$:form.post_html()
-
-
-
-
-$else:
-
- -
-$:render.footer()
diff --git a/deluge/ui/webui/templates/classic/error.html b/deluge/ui/webui/templates/classic/error.html
deleted file mode 100644
index 002cf3fc2..000000000
--- a/deluge/ui/webui/templates/classic/error.html
+++ /dev/null
@@ -1,6 +0,0 @@
-$def with (error_msg)
-$:render.header(_('Error'))
-$_("Connect")
-$if connected: -| - $_('Connected to') - $connected - | - - |
$_("Not Connected to a daemon")
-
-
-
-
-- -
- $error_msg --$:render.footer() diff --git a/deluge/ui/webui/templates/classic/footer.html b/deluge/ui/webui/templates/classic/footer.html deleted file mode 100644 index ca03a0154..000000000 --- a/deluge/ui/webui/templates/classic/footer.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - -