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

Merge branch 'master' into schema-alteration

parents 7a47ba6f 6c66a41c

INSTALL

+1 −2
Original line number Diff line number Diff line 
Thanks for downloading Django.



To install it, make sure you have Python 2.6 or greater installed. Then run

To install it, make sure you have Python 2.7 or greater installed. Then run

this command from the command prompt:



    python setup.py install
@@ -12,7 +12,6 @@ site-packages directory, which is located wherever your Python installation 
lives. Some places you might check are:



    /usr/lib/python2.7/site-packages (Unix, Python 2.7)

    /usr/lib/python2.6/site-packages (Unix, Python 2.6)

    C:\\PYTHON\site-packages         (Windows)



For more detailed instructions, see docs/intro/install.txt.

django/bin/daily_cleanup.py

deleted100755 → 0
+0 −19
Original line number Diff line number Diff line 
#!/usr/bin/env python



"""

Daily cleanup job.



Can be run as a cronjob to clean out old data from the database (only expired

sessions at the moment).

"""



import warnings



from django.core import management



if __name__ == "__main__":

    warnings.warn(

        "The `daily_cleanup` script has been deprecated "

        "in favor of `django-admin.py clearsessions`.",

        DeprecationWarning)

    management.call_command('clearsessions')

django/conf/__init__.py

+8 −14
Original line number Diff line number Diff line
@@ -59,14 +59,10 @@ class LazySettings(LazyObject): 
        Setup logging from LOGGING_CONFIG and LOGGING settings.

        """

        if not sys.warnoptions:

            try:

            # Route warnings through python logging

            logging.captureWarnings(True)

            # Allow DeprecationWarnings through the warnings filters

            warnings.simplefilter("default", DeprecationWarning)

            except AttributeError:

                # No captureWarnings on Python 2.6, DeprecationWarnings are on anyway

                pass



        if self.LOGGING_CONFIG:

            from django.utils.log import DEFAULT_LOGGING
@@ -132,19 +128,17 @@ class Settings(BaseSettings): 
                % (self.SETTINGS_MODULE, e)

            )



        # Settings that should be converted into tuples if they're mistakenly entered

        # as strings.

        tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS")



        for setting in dir(mod):

            if setting == setting.upper():

                setting_value = getattr(mod, setting)



                if setting in tuple_settings and \

                        isinstance(setting_value, six.string_types):

                    warnings.warn("The %s setting must be a tuple. Please fix your "

                                  "settings, as auto-correction is now deprecated." % setting,

                                  DeprecationWarning, stacklevel=2)

                    setting_value = (setting_value,) # In case the user forgot the comma.

                    raise ImproperlyConfigured("The %s setting must be a tuple. "

                            "Please fix your settings." % setting)



                setattr(self, setting, setting_value)



        if not self.SECRET_KEY:

django/conf/global_settings.py

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage' 
###########



# The callable to use to configure logging

LOGGING_CONFIG = 'django.utils.log.dictConfig'

LOGGING_CONFIG = 'logging.config.dictConfig'



# Custom logging configuration.

LOGGING = {}

django/conf/urls/shortcut.py

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ import warnings 
from django.conf.urls import patterns



warnings.warn("django.conf.urls.shortcut will be removed in Django 1.8.",

    PendingDeprecationWarning)

    DeprecationWarning)



urlpatterns = patterns('django.views',

    (r'^(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'defaults.shortcut'),