Commit b546e7eb authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Merge branch 'master' into schema-alteration

parents cd583d6d cff911f4

AUTHORS

+2 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ answer newbie questions, and generally made Django that much better: 
    michael.mcewan@gmail.com

    Paul McLanahan <paul@mclanahan.net>

    Tobias McNulty <http://www.caktusgroup.com/blog>

    Andrews Medina <andrewsmedina@gmail.com>

    Zain Memon

    Christian Metts

    michal@plovarna.cz
@@ -467,6 +468,7 @@ answer newbie questions, and generally made Django that much better: 
    Vinay Sajip <vinay_sajip@yahoo.co.uk>

    Bartolome Sanchez Salado <i42sasab@uco.es>

    Kadesarin Sanjek

    Tim Saylor <tim.saylor@gmail.com>

    Massimo Scamarcia <massimo.scamarcia@gmail.com>

    Paulo Scardine <paulo@scardine.com.br>

    David Schein

MANIFEST.in

+1 −1
Original line number Diff line number Diff line 
include README

include README.rst

include AUTHORS

include INSTALL

include LICENSE

django/bin/django-2to3.py

0 → 100755
+10 −0
Original line number Diff line number Diff line 
#!/usr/bin/env python



# This works exactly like 2to3, except that it uses Django's fixers rather

# than 2to3's built-in fixers.



import sys

from lib2to3.main import main



sys.exit(main("django.utils.2to3_fixes"))

django/conf/__init__.py

+11 −3
Original line number Diff line number Diff line
@@ -152,17 +152,25 @@ class UserSettingsHolder(BaseSettings): 
        Requests for configuration variables not in this class are satisfied

        from the module specified in default_settings (if possible).

        """

        self.__dict__['_deleted'] = set()

        self.default_settings = default_settings



    def __getattr__(self, name):

        if name in self._deleted:

            raise AttributeError

        return getattr(self.default_settings, name)



    def __setattr__(self, name, value):

        self._deleted.discard(name)

        return super(UserSettingsHolder, self).__setattr__(name, value)



    def __delattr__(self, name):

        self._deleted.add(name)

        return super(UserSettingsHolder, self).__delattr__(name)



    def __dir__(self):

        return list(self.__dict__) + dir(self.default_settings)



    # For Python < 2.6:

    __members__ = property(lambda self: self.__dir__())



settings = LazySettings()

django/conf/project_template/project_name/settings.py

+5 −4
Original line number Diff line number Diff line
@@ -13,10 +13,11 @@ DATABASES = { 
    'default': {

        'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.

        'NAME': '',                      # Or path to database file if using sqlite3.

        'USER': '',                      # Not used with sqlite3.

        'PASSWORD': '',                  # Not used with sqlite3.

        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.

        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.

        # The following settings are not used with sqlite3:

        'USER': '',

        'PASSWORD': '',

        'HOST': '',                      # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.

        'PORT': '',                      # Set to empty string for default.

    }

}