From b263e1704ca813f38f36ce973a7c0b26e41a18b6 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Wed, 25 Jul 2007 03:18:17 +0000 Subject: [PATCH] Changed safe_join() docstring from [5750] to use active verbs. See also [5756] git-svn-id: http://code.djangoproject.com/svn/django/trunk@5758 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/_os.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/utils/_os.py b/django/utils/_os.py index f7114af291c..56ef0f20141 100644 --- a/django/utils/_os.py +++ b/django/utils/_os.py @@ -2,8 +2,8 @@ from os.path import join, normcase, abspath, sep def safe_join(base, *paths): """ - Join one or more path components to the base path component intelligently. - Return a normalized, absolute version of the final path. + Joins one or more path components to the base path component intelligently. + Returns a normalized, absolute version of the final path. The final path must be located inside of the base path component (otherwise a ValueError is raised).