Changeset 853

Timestamp:

10/13/05 11:21:40 (3 years ago)

Author:

hugo

Message:

i18n: merged to r852

Files:

• django/branches/i18n/django/core/db/backends/mysql.py (modified) (1 diff)
• django/branches/i18n/django/core/db/backends/postgresql.py (modified) (1 diff)
• django/branches/i18n/django/core/db/backends/sqlite3.py (modified) (1 diff)
• django/branches/i18n/django/core/formfields.py (modified) (1 diff)
• django/branches/i18n/django/core/meta/fields.py (modified) (1 diff)
• django/branches/i18n/docs/install.txt (modified) (3 diffs)
• django/branches/i18n/docs/model-api.txt (modified) (1 diff)
• django/branches/i18n/docs/modpython.txt (modified) (1 diff)

django/branches/i18n/django/core/db/backends/mysql.py

@@ -144 +144 @@
-    'EmailField':        'varchar(75)',
-    'FileField':         'varchar(100)',
+    'FilePathField':     'varchar(100)',
-    'FloatField':        'numeric(%(max_digits)s, %(decimal_places)s)',
-    'ImageField':        'varchar(100)',

django/branches/i18n/django/core/db/backends/postgresql.py

@@ -155 +155 @@
-    'EmailField':        'varchar(75)',
-    'FileField':         'varchar(100)',
+    'FilePathField':     'varchar(100)',
-    'FloatField':        'numeric(%(max_digits)s, %(decimal_places)s)',
-    'ImageField':        'varchar(100)',

django/branches/i18n/django/core/db/backends/sqlite3.py

@@ -155 +155 @@
-    'EmailField':                   'varchar(75)',
-    'FileField':                    'varchar(100)',
+    'FilePathField':                'varchar(100)',
-    'FloatField':                   'numeric(%(max_digits)s, %(decimal_places)s)',
-    'ImageField':                   'varchar(100)',

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

@@ -708 +708 @@
-####################
-
+class FilePathField(SelectField):
+    "A SelectField whose choices are the files in a given directory."
+    def __init__(self, field_name, path, match=None, recursive=False, is_required=False, validator_list=[]):
+        import os
+        if match is not None:
+            import re
+            match_re = re.compile(match)
+        choices = []
+        if recursive:
+            for root, dirs, files in os.walk(path):
+                for f in files:
+                    if match is None or match_re.search(f):
+                        choices.append((os.path.join(path, f), f))
+        else:
+            try:
+                for f in os.listdir(path):
+                    full_file = os.path.join(path, f)
+                    if os.path.isfile(full_file) and (match is None or match_re.search(f)):
+                        choices.append((full_file, f))
+            except OSError:
+                pass
+        SelectField.__init__(self, field_name, choices, 1, is_required, validator_list)
+
-class PhoneNumberField(TextField):
-    "A convenience FormField for validating phone numbers (e.g. '630-555-1234')"

django/branches/i18n/django/core/meta/fields.py

@@ -428 +428 @@
-        return os.path.normpath(f)
-
+class FilePathField(Field):
+    def __init__(self, verbose_name=None, name=None, path='', match=None, recursive=False, **kwargs):
+        self.path, self.match, self.recursive = path, match, recursive
+        Field.__init__(self, verbose_name, name, **kwargs)
+
+    def get_manipulator_field_objs(self):
+        return [curry(formfields.FilePathField, path=self.path, match=self.match, recursive=self.recursive)]
+
-class FloatField(Field):
-    empty_strings_allowed = False

django/branches/i18n/docs/install.txt

@@ -22 +22 @@
-
-If you can't use mod_python for some reason, fear not: Django follows the WSGI_
-As peopl
-
-give specific installation instructions for 
+See th
+
+
-
-.. _Apache: http://httpd.apache.org/
@@ -30 +30 @@
-.. _WSGI: http://www.python.org/peps/pep-0333.html
-.. _How to use Django with mod_python: http://www.djangoproject.com/documentation/modpython/
+.. _server-arrangements wiki page: http://code.djangoproject.com/wiki/ServerArrangements
-
-Get your database running
@@ -37 +38 @@
-make sure a database server is running. Django works with PostgreSQL_
-(recommended), MySQL_ and SQLite_.
-
-Note that support for MySQL and SQLite is a recent development, and Django
-hasn't been comprehensively tested in those environments. If you find any bugs
-in Django's MySQL or SQLite bindings, please file them in
-`Django's ticket system`_ so we can fix them immediately.
-
-Additionally, you'll need to make sure your Python database bindings are

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

@@ -272 +272 @@
-
-    .. _`strftime formatting`: http://docs.python.org/lib/module-time.html#l2h-1941
+
+``FilePathField``
+    A field whose choices are limited to the filenames in a certain directory
+    on the filesystem. Has three special arguments, of which the first is
+    required:
+
+        ======================  ===================================================
+        Argument                Description
+        ======================  ===================================================
+        ``path``                Required. The absolute filesystem path to a
+                                directory from which this ``FilePathField`` should
+                                get its choices. Example: ``"/home/images"``.
+
+        ``match``               Optional. A regular expression, as a string, that
+                                ``FilePathField`` will use to filter filenames.
+                                Note that the regex will be applied to the
+                                base filename, not the full path. Example:
+                                ``"foo.*\.txt^"``, which will match a file called
+                                ``foo23.txt`` but not ``bar.txt`` or ``foo23.gif``.
+
+        ``recursive``           Optional. Either ``True`` or ``False``. Default is
+                                ``False``. Specifies whether all subdirectories of
+                                ``path`` should be included.
+        ======================  ===================================================
+
+    Of course, these arguments can be used together.
+
+    The one potential gotcha is that ``match`` applies to the base filename,
+    not the full path. So, this example::
+
+        FilePathField(path="/home/images", match="foo.*", recursive=True)
+
+    ...will match ``/home/images/foo.gif`` but not ``/home/images/foo/bar.gif``
+    because the ``match`` applies to the base filename (``foo.gif`` and
+    ``bar.gif``).
-
-``FloatField``

django/branches/i18n/docs/modpython.txt

@@ -144 +144 @@
-Just change ``Location`` to the root URL of your media files.
-
+Note that the Django development server automagically serves admin media files,
+but this is not the case when you use any other server arrangement.
+
-.. _lighttpd: http://www.lighttpd.net/
-.. _TUX: http://en.wikipedia.org/wiki/TUX_web_server