Changeset 4156

Timestamp:

12/04/06 14:29:44 (2 years ago)

Author:

jpellerin

Message:

[multi-db] Merged trunk to [4000]. Some tests still failing.

Files:

• django/branches/multiple-db-support/AUTHORS (modified) (1 diff)
• django/branches/multiple-db-support/django/conf/__init__.py (modified) (2 diffs)
• django/branches/multiple-db-support/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo (modified) (previous)
• django/branches/multiple-db-support/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.po (modified) (3 diffs)
• django/branches/multiple-db-support/django/conf/locale/pt_BR/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/multiple-db-support/django/conf/locale/pt_BR/LC_MESSAGES/django.po (modified) (51 diffs)
• django/branches/multiple-db-support/django/contrib/admin/views/doc.py (modified) (4 diffs)
• django/branches/multiple-db-support/django/contrib/admin/views/template.py (modified) (1 diff)
• django/branches/multiple-db-support/django/contrib/auth/__init__.py (modified) (1 diff)
• django/branches/multiple-db-support/django/core/cache/__init__.py (modified) (1 diff)
• django/branches/multiple-db-support/django/core/handlers/base.py (modified) (1 diff)
• django/branches/multiple-db-support/django/core/management.py (modified) (3 diffs)
• django/branches/multiple-db-support/django/core/serializers/__init__.py (modified) (1 diff)
• django/branches/multiple-db-support/django/core/servers/fastcgi.py (modified) (3 diffs)
• django/branches/multiple-db-support/django/core/urlresolvers.py (modified) (5 diffs)
• django/branches/multiple-db-support/django/db/__init__.py (modified) (2 diffs)
• django/branches/multiple-db-support/django/db/models/base.py (modified) (1 diff)
• django/branches/multiple-db-support/django/db/models/fields/__init__.py (modified) (3 diffs)
• django/branches/multiple-db-support/django/db/models/loading.py (modified) (1 diff)
• django/branches/multiple-db-support/django/newforms/fields.py (modified) (9 diffs)
• django/branches/multiple-db-support/django/newforms/forms.py (modified) (4 diffs)
• django/branches/multiple-db-support/django/newforms/__init__.py (modified) (2 diffs)
• django/branches/multiple-db-support/django/newforms/widgets.py (modified) (4 diffs)
• django/branches/multiple-db-support/django/template/context.py (modified) (1 diff)
• django/branches/multiple-db-support/django/template/__init__.py (modified) (1 diff)
• django/branches/multiple-db-support/django/template/loaders/app_directories.py (modified) (1 diff)
• django/branches/multiple-db-support/django/templatetags/__init__.py (modified) (1 diff)
• django/branches/multiple-db-support/django/test/simple.py (modified) (1 diff)
• django/branches/multiple-db-support/django/views/debug.py (modified) (1 diff)
• django/branches/multiple-db-support/docs/authentication.txt (modified) (1 diff)
• django/branches/multiple-db-support/docs/generic_views.txt (modified) (1 diff)
• django/branches/multiple-db-support/docs/static_files.txt (modified) (2 diffs)
• django/branches/multiple-db-support/tests/regressiontests/forms/tests.py (modified) (17 diffs)

django/branches/multiple-db-support/AUTHORS

@@ -92 +92 @@
-    Robert Rock Howard <http://djangomojo.com/>
-    Jason Huggins <http://www.jrandolph.com/blog/>
+        Baurzhan Ismagulov <ibr@radix50.net>
-    jcrasta@gmail.com
-    Michael Josephson <http://www.sdjournal.com/>

django/branches/multiple-db-support/django/conf/__init__.py

@@ -78 +78 @@
-
-        try:
-'', ''
+{}, {}
-        except ImportError, e:
-            raise EnvironmentError, "Could not import settings '%s' (Is it on sys.path? Does it have syntax errors?): %s" % (self.SETTINGS_MODULE, e)
@@ -98 +98 @@
-        for app in self.INSTALLED_APPS:
-            if app.endswith('.*'):
-'', ''
+{}, {}
-                for d in os.listdir(appdir):
-                    if d.isalpha() and os.path.isdir(os.path.join(appdir, d)):

django/branches/multiple-db-support/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.po

@@ -1 @@
-SOME DESCRIPTIVE TITLE
-YEAR
+Português do Brasil translation of django
+2006
-# This file is distributed under the same license as the PACKAGE package.
-FIRST AUTHOR <EMAIL@ADDRESS>, YEAR
+Carlos Eduardo de Paula <carlosedp@gmail.com>, 2006
-#
-msgid ""
@@ -9 +9 @@
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-09 11:51+0100\n"
-01-23 19:54-02
-João Marcus Christ <joaoma
+11-01 17:45-03
+Carlos Eduardo de Paula <carlosedp
-"Language-Team: Português do Brasil <pt-br@li.org>\n"
-"MIME-Version: 1.0\n"
@@ -52 +52 @@
-"December"
-msgstr ""
-o
+l
-"Dezembro"
-#: contrib/admin/media/js/dateparse.js:27

django/branches/multiple-db-support/django/conf/locale/pt_BR/LC_MESSAGES/django.po

@@ -3 +3 @@
-# This file is distributed under the same license as the PACKAGE package.
-# João Marcus Christ <joaoma@gmail.com>, 2006.
+# Carlos Eduardo de Paula <carlosedp@gmail.com>, 2006.
-#
-msgid ""
@@ -9 +10 @@
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:11+0200\n"
-01-23 19:54-02
-João Marcus Christ <joaoma
+11-01 17:45-03
+Carlos Eduardo de Paula <carlosedp
-"Language-Team: Português do Brasil <pt-br@li.org>\n"
-"MIME-Version: 1.0\n"
@@ -87 +88 @@
-msgstr ""
-"Selecione esta opção se o comentário é inapropriado. Uma mensagem \"Este "
-
+a mensagem 
-
-#: contrib/comments/models.py:91
-#, fuzzy
-msgid "comments"
-
+s
-
-#: contrib/comments/models.py:131 contrib/comments/models.py:207
@@ -151 +152 @@
-#, fuzzy
-msgid "karma scores"
-ão
+ões
-
-#: contrib/comments/models.py:242
@@ -171 +172 @@
-#: contrib/comments/models.py:265
-msgid "flag date"
-marca
+flag
-
-#: contrib/comments/models.py:268
-#, fuzzy
-msgid "user flag"
-F
+f
-
-#: contrib/comments/models.py:269
-#, fuzzy
-msgid "user flags"
-F
+f
-
-#: contrib/comments/models.py:273
@@ -190 +191 @@
-#: contrib/comments/models.py:278
-msgid "deletion date"
-apagament
+exclusã
-
-#: contrib/comments/models.py:280
-#, fuzzy
-msgid "moderator deletion"
-Apagamento feito por
+Exclusão feita pelo
-
-#: contrib/comments/models.py:281
-#, fuzzy
-msgid "moderator deletions"
-Apagamentos feitos por
+Exclusões feitas pelo
-
-#: contrib/comments/models.py:285
-#, python-format
-msgid "Moderator deletion by %r"
-Apagamento feito
+Exclusao feita
-
-#: contrib/comments/views/karma.py:19
@@ -238 +239 @@
-"%(text)s"
-msgstr[0] ""
-esboço:\n
-
+que postou menos de %(count)s 
+comentário:
-"%(text)s"
-msgstr[1] ""
-esboço:\n
-
+que postou menos de %(count)s 
+comentários:
-"%(text)s"
-
@@ -253 +254 @@
-"%(text)s"
-msgstr ""
-esboç
+incomplet
-"\n"
-"%(text)s"
@@ -300 +301 @@
-#, fuzzy
-msgid "Forgotten your password?"
-Alterar minha senha
+Esqueceu sua senha?
-
-#: contrib/comments/templates/comments/form.html:8
@@ -326 +327 @@
-#, fuzzy
-msgid "Ratings"
-avaliação #1
+Avaliações
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-
+Requerido
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
-
+Opcional
-
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
-
+Postar uma foto
-
-#: contrib/comments/templates/comments/form.html:27
@@ -352 +353 @@
-#, fuzzy
-msgid "Preview comment"
-Comentário livre
+Pré visualizar comentário
-
-#: contrib/comments/templates/comments/freeform.html:4
-#, fuzzy
-msgid "Your name:"
-usuário
+Seu nome:
-
-#: contrib/admin/filterspecs.py:40
@@ -444 +445 @@
-msgstr ""
-"Por favor entre usuário e senha corretos. Note que ambos os "
-
+ 
-
-#: contrib/admin/views/decorators.py:23
@@ -469 +470 @@
-#: contrib/admin/views/decorators.py:82
-msgid "Usernames cannot contain the '@' character."
-
+e
-
-#: contrib/admin/views/decorators.py:84
@@ -554 +555 @@
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-adiciona
+excluí
-
-#: contrib/admin/views/main.py:511
@@ -747 +748 @@
-msgstr ""
-"Houve um erro. Este foi reportado aos administradores do site através d e-"
-nserta
+rrigi
-
-#: contrib/admin/templates/admin/404.html:4
@@ -761 +762 @@
-#, python-format
-msgid "Models available in the %(name)s application."
-
+Modelos disponíveis na aplicação %(name)s
-
-#: contrib/admin/templates/admin/index.html:28
@@ -795 +796 @@
-#: contrib/admin/templates/admin/login.html:22
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-esqueceu 
+>esqueceu su
-
-#: contrib/admin/templates/admin/base.html:23
@@ -837 +838 @@
-#: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
-
+Ir
-
-#: contrib/admin/templates/admin/change_form.html:21
@@ -848 +849 @@
-msgid_plural "Please correct the errors below."
-msgstr[0] "Por favor, corrija o erro abaixo."
- erro
+s erros
-
-#: contrib/admin/templates/admin/change_form.html:48
@@ -931 +932 @@
-"should be receiving it shortly."
-msgstr ""
- estar
-ndo
+rá
+r
-
-#: contrib/admin/templates/registration/password_change_form.html:12
@@ -974 +975 @@
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
-livr
+a vontad
-
-#: contrib/admin/templates/registration/password_reset_email.html:11
@@ -1041 +1042 @@
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
-
+r
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
-para páginas 
+
-"único."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-msgid "Edit this object (new window)"
-
+r
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
@@ -1136 +1137 @@
-#: contrib/flatpages/models.py:14
-msgid "registration required"
-é obrigatório registrar
+registro obrigatório
-
-#: contrib/flatpages/models.py:14
@@ -1161 +1162 @@
-#, fuzzy
-msgid "permission"
-P
+p
-
-#: contrib/auth/models.py:18 contrib/auth/models.py:27
-#, fuzzy
-msgid "permissions"
-P
+p
-
-#: contrib/auth/models.py:29
-#, fuzzy
-msgid "group"
-G
+g
-
-#: contrib/auth/models.py:30 contrib/auth/models.py:65
-#, fuzzy
-msgid "groups"
-G
+g
-
-#: contrib/auth/models.py:55
@@ -1237 +1238 @@
-#, fuzzy
-msgid "user permissions"
-Permissões
+permissões do usuário
-
-#: contrib/auth/models.py:70
-#, fuzzy
-msgid "user"
-U
+u
-
-#: contrib/auth/models.py:71
-#, fuzzy
-msgid "users"
-U
+u
-
-#: contrib/auth/models.py:76
@@ -1268 +1269 @@
-#, fuzzy
-msgid "message"
-M
+m
-
-#: contrib/auth/forms.py:30
@@ -1276 +1277 @@
-msgstr ""
-"Seu navegador Web não parece estar com os cookies habilitados. Cookies são "
-s
+
-
-#: contrib/contenttypes/models.py:25
@@ -1418 +1419 @@
-#, fuzzy
-msgid "jan"
-e
+jan
-
-#: utils/dates.py:19
-msgid "feb"
-
+fev
-
-#: utils/dates.py:19
-msgid "mar"
-
+mar
-
-#: utils/dates.py:19
-msgid "apr"
-
+abr
-
-#: utils/dates.py:19
-#, fuzzy
-msgid "may"
-dia
+mai
-
-#: utils/dates.py:19
-msgid "jun"
-
+jun
-
-#: utils/dates.py:20
-msgid "jul"
-
+jul
-
-#: utils/dates.py:20
-msgid "aug"
-
+ago
-
-#: utils/dates.py:20
-msgid "sep"
-
+set
-
-#: utils/dates.py:20
-msgid "oct"
-
+out
-
-#: utils/dates.py:20
-msgid "nov"
-
+nov
-
-#: utils/dates.py:20
-msgid "dec"
-
+dez
-
-#: utils/dates.py:27
@@ -1498 +1499 @@
-msgid_plural "years"
-msgstr[0] "ano"
-
+s
-
-#: utils/timesince.py:13
@@ -1505 +1506 @@
-msgid_plural "months"
-msgstr[0] "mês"
-ê
+ese
-
-#: utils/timesince.py:14
-msgid "week"
-msgid_plural "weeks"
-
-
+semana
+semanas
-
-#: utils/timesince.py:15
@@ -1518 +1519 @@
-msgid_plural "days"
-msgstr[0] "dia"
-
+s
-
-#: utils/timesince.py:16
@@ -1525 +1526 @@
-msgid_plural "hours"
-msgstr[0] "hora"
-
+s
-
-#: utils/timesince.py:17
@@ -1532 +1533 @@
-msgid_plural "minutes"
-msgstr[0] "minuto"
-
+s
-
-#: conf/global_settings.py:37
-msgid "Bengali"
-
+Bengalês
-
-#: conf/global_settings.py:38
@@ -1549 +1550 @@
-#, fuzzy
-msgid "Danish"
-Espanhol
+Dinamarquês
-
-#: conf/global_settings.py:41
@@ -1557 +1558 @@
-#: conf/global_settings.py:42
-msgid "Greek"
-
+Grego
-
-#: conf/global_settings.py:43
@@ -1577 +1578 @@
-#: conf/global_settings.py:47
-msgid "Hungarian"
-
+Húngaro
-
-#: conf/global_settings.py:48
-msgid "Hebrew"
-
+Hebraico
-
-#: conf/global_settings.py:49
@@ -1605 +1606 @@
-#: conf/global_settings.py:54
-msgid "Brazilian"
-z
+s
-
-#: conf/global_settings.py:55
@@ -1622 +1623 @@
-#, fuzzy
-msgid "Slovenian"
-ac
+en
-
-#: conf/global_settings.py:59
@@ -1635 +1636 @@
-#, fuzzy
-msgid "Ukrainian"
-Brazileir
+Ucranian
-
-#: conf/global_settings.py:62
@@ -1690 +1691 @@
-#: core/validators.py:116
-msgid "Enter a whole number."
-inteir
+complet
-
-#: core/validators.py:120
@@ -1773 +1774 @@
-msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] "Lave sua boca! A palavra %s não é permitida aqui."
- palavra %s não é permitida
+s palavras %s não são permitidas
-
-#: core/validators.py:236
@@ -1809 +1810 @@
-#: core/validators.py:347
-msgid "Please enter a valid decimal number."
-
+ válido
-
-#: core/validators.py:349
@@ -1816 +1817 @@
-msgid_plural ""
-"Please enter a valid decimal number with at most %s total digits."
-s
+
-msgstr[1] "Por favor entre com um número decimal com no máximo %s digitos."
-
@@ -1825 +1826 @@
-"Please enter a valid decimal number with at most %s decimal places."
-msgstr[0] "Informe um número decimal com no máximo %s casa decimal."
- decimal
+s decimais
-
-#: core/validators.py:362
@@ -1931 +1932 @@
-#, fuzzy
-msgid "This value must be an integer."
-a potência de %s
+ inteiro
-
-#: db/models/fields/__init__.py:369
-#, fuzzy
-msgid "This value must be either True or False."
-uma potência de %s
+Verdadeiro ou Falso
-
-#: db/models/fields/__init__.py:385
-#, fuzzy
-msgid "This field cannot be null."
-é inválid
+não pode ser nul
-
-#: db/models/fields/__init__.py:562
@@ -1955 +1956 @@
-#, fuzzy
-msgid "Separate multiple IDs with commas."
- 
+
-
-#: db/models/fields/related.py:581
@@ -1962 +1963 @@
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
-um
+o
-"mais de uma opção."
-
@@ -1973 +1974 @@
-"Por favor, entre IDs válidos para %(self)s. O valor %(value)r é inválido."
-msgstr[1] ""
- valor %(value)r é inválido
+s valores %(value)r são inválidos
-
-#: forms/__init__.py:380
@@ -1979 +1980 @@
-msgid "Ensure your text is less than %s character."
-msgid_plural "Ensure your text is less than %s characters."
-s
+
-msgstr[1] "Certifique-se de que seu texto tenha menos que %s caracteres."
-
-#: forms/__init__.py:385
-msgid "Line breaks are not allowed here."
-múltiplas linhas
+quebras de linha
-
-#: forms/__init__.py:480 forms/__init__.py:551 forms/__init__.py:589
@@ -2038 +2039 @@
-#~ "%(text)s"
-#~ msgstr ""
-da
+ad
-#~ "comentário:\n"
-#~ "\n"
@@ -2048 +2049 @@
-#, fuzzy
-#~ msgid "count"
-eúdo
+agem

django/branches/multiple-db-support/django/contrib/admin/views/doc.py

@@ -99 +99 @@
-
-    if settings.ADMIN_FOR:
-'', ''
+{}, {}
-    else:
-        settings_modules = [settings]
@@ -105 +105 @@
-    views = []
-    for settings_mod in settings_modules:
-'', ''
+{}, {}
-        view_functions = extract_views_from_urlpatterns(urlconf.urlpatterns)
-        if Site._meta.installed:
@@ -128 +128 @@
-    mod, func = urlresolvers.get_mod_func(view)
-    try:
-'', ''
+{}, {}
-    except (ImportError, AttributeError):
-        raise Http404
@@ -236 +236 @@
-    templates = []
-    for site_settings_module in settings.ADMIN_FOR:
-'', ''
+{}, {}
-        if Site._meta.installed:
-            site_obj = Site.objects.get(pk=settings_mod.SITE_ID)

django/branches/multiple-db-support/django/contrib/admin/views/template.py

@@ -15 +15 @@
-    settings_modules = {}
-    for mod in settings.ADMIN_FOR:
-'', ''
+{}, {}
-        settings_modules[settings_module.SITE_ID] = settings_module
-    manipulator = TemplateValidator(settings_modules)

django/branches/multiple-db-support/django/contrib/auth/__init__.py

@@ -10 +10 @@
-    module, attr = path[:i], path[i+1:]
-    try:
-'', ''
+{}, {}
-    except ImportError, e:
-        raise ImproperlyConfigured, 'Error importing authentication backend %s: "%s"' % (module, e)

django/branches/multiple-db-support/django/core/cache/__init__.py

@@ -49 +49 @@
-        host = host[:-1]
-
-'', ''
+{}, {}
-    return cache_class(host, params)
-

django/branches/multiple-db-support/django/core/handlers/base.py

@@ -27 +27 @@
-            mw_module, mw_classname = middleware_path[:dot], middleware_path[dot+1:]
-            try:
-'', ''
+{}, {}
-            except ImportError, e:
-                raise exceptions.ImproperlyConfigured, 'Error importing middleware %s: "%s"' % (mw_module, e)

django/branches/multiple-db-support/django/core/management.py

@@ -290 +290 @@
-        # dispatcher events.
-        try:
-'', ''
+{}, {}
-        except ImportError:
-            pass
@@ -1079 +1079 @@
-    else:
-        test_module_name = '.'
-[],[],
+{}, {}, 
-    test_runner = getattr(test_module, test_path[-1])
-
@@ -1268 +1268 @@
-    project_name = os.path.basename(project_directory)
-    sys.path.append(os.path.join(project_directory, '..'))
-'', ''
+{}, {}
-    sys.path.pop()
-

django/branches/multiple-db-support/django/core/serializers/__init__.py

@@ -30 +30 @@
-def register_serializer(format, serializer_module):
-    """Register a new serializer by passing in a module name."""
-'', ''
+{}, {}
-    _serializers[format] = module
-    

django/branches/multiple-db-support/django/core/servers/fastcgi.py

@@ -32 +32 @@
-  socket=FILE          UNIX socket to listen on.
-  method=IMPL          prefork or threaded (default prefork)
+  maxrequests=NUMBER   number of requests a child handles before it is 
+                       killed and a new child is forked (0 = no limit).
-  maxspare=NUMBER      max number of spare processes to keep running.
-  minspare=NUMBER      min number of spare processes to prefork.
@@ -67 +69 @@
-    'minspare': 2,
-    'maxchildren': 50,
+    'maxrequests': 0,
-}
-
@@ -104 +107 @@
-            'minSpare': int(options["minspare"]),
-            'maxChildren': int(options["maxchildren"]),
+            'maxRequests': int(options["maxrequests"]), 
-        }
-    elif options['method'] in ('thread', 'threaded'):

django/branches/multiple-db-support/django/core/urlresolvers.py

@@ -120 +120 @@
-        mod_name, func_name = get_mod_func(self._callback_str)
-        try:
-'', ''
+{}, {}
-        except ImportError, e:
-            raise ViewDoesNotExist, "Could not import %s. Error was: %s" % (mod_name, str(e))
@@ -131 +131 @@
-        mod_name, func_name = get_mod_func(viewname)
-        try:
-'', ''
+{}, {}
-        except (ImportError, AttributeError):
-            raise NoReverseMatch
@@ -172 +172 @@
-        except AttributeError:
-            try:
-'', ''
+{}, {}
-            except ValueError, e:
-                # Invalid urlconf_name, such as "foo.bar." (note trailing period)
@@ -187 +187 @@
-        mod_name, func_name = get_mod_func(callback)
-        try:
-'', ''
+{}, {}
-        except (ImportError, AttributeError), e:
-            raise ViewDoesNotExist, "Tried %s. Error was: %s" % (callback, str(e))
@@ -201 +201 @@
-            mod_name, func_name = get_mod_func(lookup_view)
-            try:
-'', ''
+{}, {}
-            except (ImportError, AttributeError):
-                raise NoReverseMatch

django/branches/multiple-db-support/django/db/__init__.py

@@ -74 +74 @@
-    def get_introspection_module(self):
-        return __import__('django.db.backends.%s.introspection' % 
-'', ''
+{}, {}
-
-    def get_creation_module(self):
-        return __import__('django.db.backends.%s.creation' % 
-'', ''
+{}, {}
-
-    def load_backend(self):
-        try:
-            backend = __import__('django.db.backends.%s.base' %
-'', ''
+{}, {}
-        except ImportError, e:
-            # The database backend wasn't found. Display a helpful error
@@ -109 +109 @@
-    def runshell(self):
-        __import__('django.db.backends.%s.client' %
-'', ''
+{}, {}
-                   ).runshell(self.settings)
-        

django/branches/multiple-db-support/django/db/models/base.py

@@ -384 +384 @@
-        return getattr(self, cachename)
-
-    # Handles setting many-to-many related objects.
-    # Example: Album.set_songs()
-    def _set_related_many_to_many(self, rel_class, rel_field, id_list):
-        id_list = map(int, id_list) # normalize to integers
-        rel = rel_field.rel.to
-        m2m_table = rel_field.m2m_db_table()
-        this_id = self._get_pk_val()
-        db = self._default_manager.db
-        connection = db.connection
-        qn = db.backend.quote_name
-        cursor = connection.cursor()
-        cursor.execute("DELETE FROM %s WHERE %s = %%s" % \
-            (qn(m2m_table),
-            qn(rel_field.m2m_column_name())), [this_id])
-        sql = "INSERT INTO %s (%s, %s) VALUES (%%s, %%s)" % \
-            (qn(m2m_table),
-            qn(rel_field.m2m_column_name()),
-            qn(rel_field.m2m_reverse_name()))
-        cursor.executemany(sql, [(this_id, i) for i in id_list])
-        transaction.commit_unless_managed([connection])
-
-############################################
-# HELPER FUNCTIONS (CURRIED MODEL METHODS) #