Changeset 1027

Timestamp:

10/30/05 18:13:29 (3 years ago)

Author:

hugo

Message:

i18n: merged to [1025] from trunk

Files:

• django/branches/i18n/django/bin/django-admin.py (modified) (2 diffs)
• django/branches/i18n/django/conf/global_settings.py (modified) (1 diff)
• django/branches/i18n/django/contrib/admin/media/js/urlify.js (modified) (1 diff)
• django/branches/i18n/django/contrib/admin/views/doc.py (modified) (1 diff)
• django/branches/i18n/django/contrib/admin/views/main.py (modified) (1 diff)
• django/branches/i18n/django/core/cache.py (modified) (2 diffs)
• django/branches/i18n/django/core/formfields.py (modified) (3 diffs)
• django/branches/i18n/django/core/handlers/base.py (modified) (1 diff)
• django/branches/i18n/django/core/management.py (modified) (1 diff)
• django/branches/i18n/django/core/template/defaultfilters.py (modified) (2 diffs)
• django/branches/i18n/django/utils/autoreload.py (modified) (1 diff)
• django/branches/i18n/django/utils/cache.py (modified) (2 diffs)
• django/branches/i18n/django/views/decorators/auth.py (modified) (2 diffs)
• django/branches/i18n/django/views/decorators/cache.py (modified) (1 diff)
• django/branches/i18n/django/views/decorators/http.py (modified) (1 diff)
• django/branches/i18n/django/views/defaults.py (modified) (3 diffs)
• django/branches/i18n/docs/cache.txt (modified) (2 diffs)
• django/branches/i18n/docs/model-api.txt (modified) (2 diffs)
• django/branches/i18n/tests/othertests/defaultfilters.py (added)

django/branches/i18n/django/bin/django-admin.py

@@ -20 +20 @@
-    'inspectdb': management.inspectdb,
-    'install': management.install,
+    'installperms': management.installperms,
-    'runserver': management.runserver,
-    'sql': management.get_sql_create,
@@ -33 +34 @@
-}
-
-
+installperms', '
-
-def get_usage():

django/branches/i18n/django/conf/global_settings.py

@@ -84 +84 @@
-# documentation.
-TEMPLATE_LOADERS = (
-#     'django.core.template.loaders.app_directories.load_template_source',
-    'django.core.template.loaders.filesystem.load_template_source',
+    'django.core.template.loaders.app_directories.load_template_source',
-#     'django.core.template.loaders.eggs.load_template_source',
-)

django/branches/i18n/django/contrib/admin/media/js/urlify.js

@@ -10 +10 @@
-    s = s.replace(/[^\w\s-]/g, '');  // remove unneeded chars
-    s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
-_');      // convert spaces to underscore
+-');      // convert spaces to hyphen
-    s = s.toLowerCase();             // convert to lowercase
-    return s.substring(0, num_chars);// trim to first num_chars chars

django/branches/i18n/django/contrib/admin/views/doc.py

@@ -289 +289 @@
-def get_readable_field_data_type(field):
-    # ForeignKey is a special case. Use the field type of the relation.
-__class__.__name__
+get_internal_type()
-        field = field.rel.get_related_field()
-__class__.__name__
+get_internal_type()
-
-def extract_views_from_urlpatterns(urlpatterns, base=''):

django/branches/i18n/django/contrib/admin/views/main.py

@@ -557 +557 @@
-            seen_collapse = True
-            javascript_imports.append('%sjs/admin/CollapsedFieldsets.js' % ADMIN_MEDIA_PREFIX)
-try
-for field_list in options['fields']
+for field_list in options['fields']
+try
-                for f in field_list:
-                    if f.rel and isinstance(f, meta.ManyToManyField) and f.rel.filter_interface:
-                        javascript_imports.extend(['%sjs/SelectBox.js' % ADMIN_MEDIA_PREFIX, '%sjs/SelectFilter2.js' % ADMIN_MEDIA_PREFIX])
-                        raise StopIteration
-
-
+    
+    
-    for j in javascript_imports:
-        t.append('<script type="text/javascript" src="%s"></script>' % j)

django/branches/i18n/django/core/cache.py

@@ -14 +14 @@
-
-    memcached://127.0.0.1:11211/    A memcached backend; the server is running
-
+
+
+
-
-    db://tablename/                 A database backend in a table named
@@ -135 +137 @@
-        def __init__(self, server, params):
-            _Cache.__init__(self, params)
-[server]
+server.split(';')
-
-        def get(self, key, default=None):

django/branches/i18n/django/core/formfields.py

@@ -216 +216 @@
-
-class TextField(FormField):
+    input_type = "text"
-    def __init__(self, field_name, length=30, maxlength=None, is_required=False, validator_list=[]):
-        self.field_name = field_name
@@ -238 +239 @@
-        if isinstance(data, unicode):
-            data = data.encode(DEFAULT_CHARSET)
-text
-
+%s
+self.input_type, 
-            self.field_name, self.length, escape(data), maxlength)
-
@@ -247 +248 @@
-
-class PasswordField(TextField):
-
-
-
-
-
+
-
-class LargeTextField(TextField):

django/branches/i18n/django/core/handlers/base.py

@@ -48 +48 @@
-        from django.core.mail import mail_admins
-        from django.conf.settings import DEBUG, INTERNAL_IPS, ROOT_URLCONF
+
+        # Reset query list per request.
+        db.db.queries = []
-
-        # Apply request middleware

django/branches/i18n/django/core/management.py

@@ -345 +345 @@
-install.help_doc = "Executes ``sqlall`` for the given model module name(s) in the current database."
-install.args = APP_ARGS
+
+def installperms(mod):
+    "Installs any permissions for the given model, if needed."
+    from django.models.auth import permissions
+    from django.models.core import packages
+    num_added = 0
+    package = packages.get_object(pk=mod._MODELS[0]._meta.app_label)
+    for klass in mod._MODELS:
+        opts = klass._meta
+        for codename, name in _get_all_permissions(opts):
+            try:
+                permissions.get_object(name__exact=name, codename__exact=codename, package__label__exact=package.label)
+            except permissions.PermissionDoesNotExist:
+                p = permissions.Permission(name=name, package=package, codename=codename)
+                p.save()
+                print "Added permission '%r'." % p
+                num_added += 1
+    if not num_added:
+        print "No permissions were added, because all necessary permissions were already installed."
+installperms.help_doc = "Installs any permissions for the given model module name(s), if needed."
+installperms.args = APP_ARGS
-
-def _start_helper(app_or_project, name, directory, other_name=''):

django/branches/i18n/django/core/template/defaultfilters.py

@@ -25 +25 @@
-def floatformat(text, _):
-    """
-
+-
-    only if there's a point to be displayed
-    """
-rom math import modf
-if not text:
-    return ''
-if modf(float(text))[0] < 0.1:
-    return text
-return "%.1f" % float(text
+ = float(text)
+m = f - int(f)
+if m:
+    return '%.1f' % f
+else:
+    return '%d' % int(f
-
-def linenumbers(value, _):
@@ -176 +176 @@
-    tags = [re.escape(tag) for tag in tags.split()]
-    tags_re = '(%s)' % '|'.join(tags)
-'<%s(
+r'<%s(/?
-    endtag_re = re.compile('</%s>' % tags_re)
-    value = starttag_re.sub('', value)

django/branches/i18n/django/utils/autoreload.py

@@ -38 +38 @@
-    while RUN_RELOADER:
-        for filename in filter(lambda v: v, map(lambda m: getattr(m, "__file__", None), sys.modules.values())) + reloadFiles:
+            if not os.path.exists(filename):
+                continue # File might be in an egg, so it can't be reloaded.
-            if filename.endswith(".pyc"):
-                filename = filename[:-1]

django/branches/i18n/django/utils/cache.py

@@ -22 +22 @@
-from django.core.cache import cache
-
+cc_delim_re = re.compile(r'\s*,\s*')
+def patch_cache_control(response, **kwargs):
+    """
+    This function patches the Cache-Control header by adding all
+    keyword arguments to it. The transformation is as follows:
+
+    - all keyword parameter names are turned to lowercase and
+      all _ will be translated to -
+    - if the value of a parameter is True (exatly True, not just a
+      true value), only the parameter name is added to the header
+    - all other parameters are added with their value, after applying
+      str to it.
+    """
+
+    def dictitem(s):
+        t = s.split('=',1)
+        if len(t) > 1:
+            return (t[0].lower().replace('-', '_'), t[1])
+        else:
+            return (t[0].lower().replace('-', '_'), True)
+
+    def dictvalue(t):
+        if t[1] == True:
+            return t[0]
+        else:
+            return t[0] + '=' + str(t[1])
+
+    if response.has_header('Cache-Control'):
+        print response['Cache-Control']
+        cc = cc_delim_re.split(response['Cache-Control'])
+        print cc
+        cc = dict([dictitem(el) for el in cc])
+    else:
+        cc = {}
+    for (k,v) in kwargs.items():
+        cc[k.replace('_', '-')] = v
+    cc = ', '.join([dictvalue(el) for el in cc.items()])
+    response['Cache-Control'] = cc
+
-vary_delim_re = re.compile(r',\s*')
-
@@ -44 +83 @@
-    if not response.has_header('Expires'):
-        response['Expires'] = expires.strftime('%a, %d %b %Y %H:%M:%S GMT')
-
-
+
-
-def patch_vary_headers(response, newheaders):

django/branches/i18n/django/views/decorators/auth.py

@@ -1 @@
-view_func, 
+
-    """
-    Decorator for views that checks that the user passes the given test,
@@ -5 +5 @@
-    that takes the user object and returns True if the user passes.
-    """
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-    """
-    Decorator for views that checks that the user is logged in, redirecting
-    to the log-in page if necessary.
-    """
-return user_passes_test(lambda u: not u.is_anonymous()
+

django/branches/i18n/django/views/decorators/cache.py

@@ -11 +11 @@
-account on caching -- just like the middleware does.
-"""
+import re
-
-from django.utils.decorators import decorator_from_middleware
+from django.utils.cache import patch_cache_control
-from django.middleware.cache import CacheMiddleware
-
-cache_page = decorator_from_middleware(CacheMiddleware)
+
+def cache_control(**kwargs):
+
+    def _cache_controller(viewfunc):
+
+        def _cache_controlled(request, *args, **kw):
+            response = viewfunc(request, *args, **kw)
+            patch_cache_control(response, **kwargs)
+            return response
+
+        return _cache_controlled
+
+    return _cache_controller
+

django/branches/i18n/django/views/decorators/http.py

@@ -1 +1 @@
-"""
-
-
+
-"""
-
-from django.utils.decorators import decorator_from_middleware
-from django.middleware.http import ConditionalGetMiddleware
+from django.utils.httpwrappers import HttpResponseForbidden
-
-conditional_page = decorator_from_middleware(ConditionalGetMiddleware)
+
+def require_http_methods(request_method_list):
+    """
+    Decorator to make a view only accept particular request methods.  Usage::
+    
+        @require_http_methods(["GET", "POST"])
+        def my_view(request):
+            # I can assume now that only GET or POST requests make it this far
+            # ...    
+            
+    Note that request methods ARE case sensitive.
+    """
+    def decorator(func):
+        def inner(request, *args, **kwargs):
+            method = request.META.get("REQUEST_METHOD", None) 
+            if method not in request_method_list:
+                raise HttpResponseForbidden("REQUEST_METHOD '%s' not allowed" % method)
+            return func(request, *args, **kwargs)
+        return inner
+    return decorator
+
+require_GET = require_http_methods(["GET"])
+require_GET.__doc__ = "Decorator to require that a view only accept the GET method."
+
+require_POST = require_http_methods(["POST"])
+require_POST.__doc__ = "Decorator to require that a view only accept the POST method."

django/branches/i18n/django/views/defaults.py

@@ -1 +1 @@
-from django.core.exceptions import Http404, ObjectDoesNotExist
-from django.core.template import Context, loader
-
+, contenttypes
-from django.utils import httpwrappers
-
-def shortcut(request, content_type_id, object_id):
-
+
+
-    try:
-        content_type = contenttypes.get_object(pk=content_type_id)
@@ -15 +16 @@
-    except AttributeError:
-        raise Http404, "%s objects don't have get_absolute_url() methods" % content_type.name
+    
+    # Try to figure out the object's domain so we can do a cross-site redirect
+    # if necessary
+
+    # If the object actually defines a domain, we're done.
-    if absurl.startswith('http://'):
-        return httpwrappers.HttpResponseRedirect(absurl)
+
-    object_domain = None
+    
+    # Next, look for an many-to-many relationship to sites
-    if hasattr(obj, 'get_site_list'):
-        site_list = obj.get_site_list()
-        if site_list:
-            object_domain = site_list[0].domain
+   
+    # Next, look for a many-to-one relationship to sites 
-    elif hasattr(obj, 'get_site'):
-        try:
@@ -27 +38 @@
-        except sites.SiteDoesNotExist:
-            pass
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-def page_not_found(request):

django/branches/i18n/docs/cache.txt

@@ -30 +30 @@
-    ==============================  ===========================================
-    memcached://127.0.0.1:11211/    A memcached backend; the server is running
-
+
+
+
-
-    db://tablename/                 A database backend in a table named
@@ -271 +273 @@
-.. _`HTTP Vary headers`: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.44
-
+Controlling cache: Using Vary headers
+=====================================
+
+Another problem with caching is the privacy of data, and the question where data can
+be stored in a cascade of caches. A user usually faces two kinds of caches: his own
+browser cache (a private cache) and his providers cache (a public cache). A public cache
+is used by multiple users and controlled by someone else. This poses problems with private
+(in the sense of sensitive) data - you don't want your social security number or your
+banking account numbers stored in some public cache. So web applications need a way
+to tell the caches what data is private and what is public.
+
+Other aspects are the definition how long a page should be cached at max, or wether the
+cache should allways check for newer versions and only deliver the cache content when
+there were no changes (some caches might deliver cached content even if the server page
+changed - just because the cache copy isn't yet expired).
+
+So there are a multitude of options you can control for your pages. This is where the
+Cache-Control header (more infos in `HTTP Cache-Control headers`_) comes in. The usage
+is quite simple::
+
+    @cache_control(private=True, must_revalidate=True, max_age=3600)
+    def my_view(request):
+        ...
+
+This would define the view as private, to be revalidated on every access and cache
+copies will only be stored for 3600 seconds at max.
+
+The caching middleware already set's this header up with a max-age of the CACHE_MIDDLEWARE_SETTINGS
+setting. And the cache_page decorator does the same. The cache_control decorator correctly merges
+different values into one big header, though. But you should take into account that middlewares
+might overwrite some of your headers or set their own defaults if you don't give that header yourself.
+
+.. _`HTTP Cache-Control headers`: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
+
-Other optimizations
-===================

django/branches/i18n/docs/model-api.txt

@@ -622 +622 @@
-
-    ``limit_choices_to``     See the description under ``ForeignKey`` above.
+
+    ``singular``             The singular name of the field.  Use to name the ``get_*``
+                             methods: in the example above, Django gives the ``Pizza``
+                             objects a ``get_topping_list()`` method, where ``topping``
+                             is the default ``singular`` value derived from the lowercase
+                             version of the class being linked to.  Use the singular
+                             parameter to change this, which is if you want one model to
+                             have multiple ``ManyToMany`` relationships to another model.
-    =======================  ============================================================
-
@@ -751 +759 @@
-    Extra permissions to enter into the permissions table when creating this
-    object. Add, delete and change permissions are automatically created for
-
+
+
-
-        permissions = (("can_deliver_pizzas", "Can deliver pizzas"),)
-
-f 2-tuples of
+r tuple of 2-tuples in the format
-    ``(permission_code, human_readable_permission_name)``.
-