web: Add some basic Python built-ins

They don't need any special wrapping, so lets pass them as they come.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/web/base.py b/src/web/base.py
index 62f07573eef635b0e4e43ade35568dcc855edee8..9f4806ed1b811e565ce1b557650f660181b897ea 100644 (file)
--- a/src/web/base.py
+++ b/src/web/base.py
@@ -307,7 +307,6 @@ class BaseHandler(tornado.web.RequestHandler):
                        "avatar_url"    : filters.avatar_url,
                        "email_address" : filters.email_address,
                        "email_name"    : filters.email_name,
-                       "enumerate"     : filters._enumerate,
                        "file_mode"     : filters.file_mode,
                        "format_asn"    : filters.format_asn,
                        "format_date"   : filters.format_date,
@@ -317,6 +316,10 @@ class BaseHandler(tornado.web.RequestHandler):
                        "hostname"      : filters.hostname,
                        "markdown"      : filters._markdown,
                        "static_url"    : filters.static_url,
+
+                       # Add some Python built-ins
+                       "dir"           : dir,
+                       "enumerate"     : enumerate,
                }
 
                return JinjaTemplateLoader(env)

diff --git a/src/web/filters.py b/src/web/filters.py
index b7f39acb04a141766123f25ab7ac4abeed460921..044a98faf40d47ecfdf0cefa00dd0a983b386870 100644 (file)
--- a/src/web/filters.py
+++ b/src/web/filters.py
@@ -49,12 +49,6 @@ def email_name(e):
 
        return name or address
 
-def _enumerate(*args, **kwargs):
-       """
-               Wraps enumerate()
-       """
-       return enumerate(*args, **kwargs)
-
 def file_mode(mode):
        """
                Converts the file mode into a string