Commit 1101467c authored by Tim Graham's avatar Tim Graham
Browse files

Limited lines to 119 characters in django/ 

refs #23395.
parent f8bb8436

django/conf/__init__.py

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ class Settings(BaseSettings): 
            mod = importlib.import_module(self.SETTINGS_MODULE)

        except ImportError as e:

            raise ImportError(

                "Could not import settings '%s' (Is it on sys.path? Is there an import error in the settings file?): %s"

                "Could not import settings '%s' (Is it on sys.path? Is there an "

                "import error in the settings file?): %s"

                % (self.SETTINGS_MODULE, e)

            )

django/conf/global_settings.py

+25 −12
Original line number Diff line number Diff line
@@ -459,18 +459,31 @@ MIDDLEWARE_CLASSES = ( 
# SESSIONS #

############



SESSION_CACHE_ALIAS = 'default'                         # Cache to store session data if using the cache session backend.

SESSION_COOKIE_NAME = 'sessionid'                       # Cookie name. This can be whatever you want.

SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2               # Age of cookie, in seconds (default: 2 weeks).

SESSION_COOKIE_DOMAIN = None                            # A string like ".example.com", or None for standard domain cookie.

SESSION_COOKIE_SECURE = False                           # Whether the session cookie should be secure (https:// only).

SESSION_COOKIE_PATH = '/'                               # The path of the session cookie.

SESSION_COOKIE_HTTPONLY = True                          # Whether to use the non-RFC standard httpOnly flag (IE, FF3+, others)

SESSION_SAVE_EVERY_REQUEST = False                      # Whether to save the session data on every request.

SESSION_EXPIRE_AT_BROWSER_CLOSE = False                 # Whether a user's session cookie expires when the Web browser is closed.

SESSION_ENGINE = 'django.contrib.sessions.backends.db'  # The module to store session data

SESSION_FILE_PATH = None                                # Directory to store session files if using the file session module. If None, the backend will use a sensible default.

SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'  # class to serialize session data

# Cache to store session data if using the cache session backend.

SESSION_CACHE_ALIAS = 'default'

# Cookie name. This can be whatever you want.

SESSION_COOKIE_NAME = 'sessionid'

# Age of cookie, in seconds (default: 2 weeks).

SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2

# A string like ".example.com", or None for standard domain cookie.

SESSION_COOKIE_DOMAIN = None

# Whether the session cookie should be secure (https:// only).

SESSION_COOKIE_SECURE = False

# The path of the session cookie.

SESSION_COOKIE_PATH = '/'

# Whether to use the non-RFC standard httpOnly flag (IE, FF3+, others)

SESSION_COOKIE_HTTPONLY = True

# Whether to save the session data on every request.

SESSION_SAVE_EVERY_REQUEST = False

# Whether a user's session cookie expires when the Web browser is closed.

SESSION_EXPIRE_AT_BROWSER_CLOSE = False

# The module to store session data

SESSION_ENGINE = 'django.contrib.sessions.backends.db'

# Directory to store session files if using the file session module. If None,

# the backend will use a sensible default.

SESSION_FILE_PATH = None

# class to serialize session data

SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'



#########

# CACHE #

django/conf/locale/nl/formats.py

+8 −4
Original line number Diff line number Diff line
@@ -33,13 +33,17 @@ TIME_INPUT_FORMATS = ( 
)

DATETIME_INPUT_FORMATS = (

    # With time in %H:%M:%S :

    '%d-%m-%Y %H:%M:%S', '%d-%m-%y %H:%M:%S', '%Y-%m-%d %H:%M:%S',  # '20-01-2009 15:23:35', '20-01-09 15:23:35', '2009-01-20 15:23:35'

    '%d/%m/%Y %H:%M:%S', '%d/%m/%y %H:%M:%S', '%Y/%m/%d %H:%M:%S',  # '20/01/2009 15:23:35', '20/01/09 15:23:35', '2009/01/20 15:23:35'

    '%d-%m-%Y %H:%M:%S', '%d-%m-%y %H:%M:%S', '%Y-%m-%d %H:%M:%S',

    # '20-01-2009 15:23:35', '20-01-09 15:23:35', '2009-01-20 15:23:35'

    '%d/%m/%Y %H:%M:%S', '%d/%m/%y %H:%M:%S', '%Y/%m/%d %H:%M:%S',

    # '20/01/2009 15:23:35', '20/01/09 15:23:35', '2009/01/20 15:23:35'

    # '%d %b %Y %H:%M:%S', '%d %b %y %H:%M:%S',   # '20 jan 2009 15:23:35', '20 jan 09 15:23:35'

    # '%d %B %Y %H:%M:%S', '%d %B %y %H:%M:%S',   # '20 januari 2009 15:23:35', '20 januari 2009 15:23:35'

    # With time in %H:%M:%S.%f :

    '%d-%m-%Y %H:%M:%S.%f', '%d-%m-%y %H:%M:%S.%f', '%Y-%m-%d %H:%M:%S.%f',  # '20-01-2009 15:23:35.000200', '20-01-09 15:23:35.000200', '2009-01-20 15:23:35.000200'

    '%d/%m/%Y %H:%M:%S.%f', '%d/%m/%y %H:%M:%S.%f', '%Y/%m/%d %H:%M:%S.%f',  # '20/01/2009 15:23:35.000200', '20/01/09 15:23:35.000200', '2009/01/20 15:23:35.000200'

    '%d-%m-%Y %H:%M:%S.%f', '%d-%m-%y %H:%M:%S.%f', '%Y-%m-%d %H:%M:%S.%f',

    # '20-01-2009 15:23:35.000200', '20-01-09 15:23:35.000200', '2009-01-20 15:23:35.000200'

    '%d/%m/%Y %H:%M:%S.%f', '%d/%m/%y %H:%M:%S.%f', '%Y/%m/%d %H:%M:%S.%f',

    # '20/01/2009 15:23:35.000200', '20/01/09 15:23:35.000200', '2009/01/20 15:23:35.000200'

    # With time in %H.%M:%S :

    '%d-%m-%Y %H.%M:%S', '%d-%m-%y %H.%M:%S',   # '20-01-2009 15.23:35', '20-01-09 15.23:35'

    '%d/%m/%Y %H.%M:%S', '%d/%m/%y %H.%M:%S',   # '20/01/2009 15.23:35', '20/01/09 15.23:35'

django/contrib/admin/bin/compress.py

+4 −1
Original line number Diff line number Diff line
@@ -23,7 +23,10 @@ Compiler library and Java version 6 or later.""" 


    compiler = os.path.expanduser(options.compiler)

    if not os.path.exists(compiler):

        sys.exit("Google Closure compiler jar file %s not found. Please use the -c option to specify the path." % compiler)

        sys.exit(

            "Google Closure compiler jar file %s not found. Please use the -c "

            "option to specify the path." % compiler

        )



    if not options.file:

        if options.verbose:

django/contrib/admin/checks.py

+6 −3
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ class BaseModelAdminChecks(object): 
            if not (isinstance(field, models.ForeignKey) or field.choices):

                return [

                    checks.Error(

                        "The value of '%s' refers to '%s', which is not an instance of ForeignKey, and does not have a 'choices' definition." % (

                        "The value of '%s' refers to '%s', which is not an "

                        "instance of ForeignKey, and does not have a 'choices' definition." % (

                            label, field_name

                        ),

                        hint=None,
@@ -592,7 +593,8 @@ class ModelAdminChecks(BaseModelAdminChecks): 
            if field is None:

                return [

                    checks.Error(

                        "The value of '%s' refers to '%s', which is not a callable, an attribute of '%s', or an attribute or method on '%s.%s'." % (

                        "The value of '%s' refers to '%s', which is not a "

                        "callable, an attribute of '%s', or an attribute or method on '%s.%s'." % (

                            label, item, cls.__name__, model._meta.app_label, model._meta.object_name

                        ),

                        hint=None,
@@ -619,7 +621,8 @@ class ModelAdminChecks(BaseModelAdminChecks): 
                    # This is a deliberate repeat of E108; there's more than one path

                    # required to test this condition.

                    checks.Error(

                        "The value of '%s' refers to '%s', which is not a callable, an attribute of '%s', or an attribute or method on '%s.%s'." % (

                        "The value of '%s' refers to '%s', which is not a callable, "

                        "an attribute of '%s', or an attribute or method on '%s.%s'." % (

                            label, item, cls.__name__, model._meta.app_label, model._meta.object_name

                        ),

                        hint=None,