mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Removed 'admin', 'exceptions' and 'module_constants' parameters to 'class Meta'

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty
2006-01-23 04:35:02 +00:00
parent d78533535f
commit c8c7f07190
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/auth/models.py
View File

@@ -6,6 +6,9 @@ import datetime
SESSION_KEY = '_auth_user_id' SESSION_KEY = '_auth_user_id'
class SiteProfileNotAvailable(Exception):
pass
class Permission(models.Model): class Permission(models.Model):
name = models.CharField(_('name'), maxlength=50) name = models.CharField(_('name'), maxlength=50)
package = models.ForeignKey(Package, db_column='package') package = models.ForeignKey(Package, db_column='package')
@@ -67,7 +70,6 @@ class User(models.Model):
verbose_name = _('User') verbose_name = _('User')
verbose_name_plural = _('Users') verbose_name_plural = _('Users')
ordering = ('username',) ordering = ('username',)
exceptions = ('SiteProfileNotAvailable',)
class Admin: class Admin:
fields = ( fields = (
(None, {'fields': ('username', 'password')}), (None, {'fields': ('username', 'password')}),

7
django/contrib/sessions/models.py
View File

@@ -40,13 +40,6 @@ class Session(models.Model):
db_table = 'django_session' db_table = 'django_session'
verbose_name = _('session') verbose_name = _('session')
verbose_name_plural = _('sessions') verbose_name_plural = _('sessions')
module_constants = {
'base64': base64,
'md5': md5,
'pickle': pickle,
'random': random,
'sys': sys,
}
def get_decoded(self): def get_decoded(self):
encoded_data = base64.decodestring(self.session_data) encoded_data = base64.decodestring(self.session_data)

6
django/db/models/options.py
View File

@@ -10,8 +10,8 @@ import re
get_verbose_name = lambda class_name: re.sub('([A-Z])', ' \\1', class_name).lower().strip() get_verbose_name = lambda class_name: re.sub('([A-Z])', ' \\1', class_name).lower().strip()
DEFAULT_NAMES = ('verbose_name', 'verbose_name_plural', 'db_table', 'ordering', DEFAULT_NAMES = ('verbose_name', 'verbose_name_plural', 'db_table', 'ordering',
'unique_together', 'admin', 'where_constraints', 'exceptions', 'permissions', 'unique_together', 'where_constraints', 'permissions',
'get_latest_by', 'order_with_respect_to', 'module_constants') 'get_latest_by', 'order_with_respect_to')
class Options: class Options:
def __init__(self, meta): def __init__(self, meta):
@@ -22,12 +22,10 @@ class Options:
self.ordering = [] self.ordering = []
self.unique_together = [] self.unique_together = []
self.where_constraints = [] self.where_constraints = []
self.exceptions = []
self.permissions = [] self.permissions = []
self.object_name, self.app_label = None, None self.object_name, self.app_label = None, None
self.get_latest_by = None self.get_latest_by = None
self.order_with_respect_to = None self.order_with_respect_to = None
self.module_constants = {}
self.admin = None self.admin = None
self.meta = meta self.meta = meta
self.pk = None self.pk = None