summaryrefslogtreecommitdiff
path: root/django/utils/_os.py
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2007-07-25 03:18:17 +0000
committerAdrian Holovaty <adrian@holovaty.com>2007-07-25 03:18:17 +0000
commitb263e1704ca813f38f36ce973a7c0b26e41a18b6 (patch)
treee6f309272a1da0beb8f8d55a763d0e5d2f28f2ba /django/utils/_os.py
parent6b7c33286a42d3f5432932240074359ef3108f98 (diff)
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
Diffstat (limited to 'django/utils/_os.py')
-rw-r--r--django/utils/_os.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/utils/_os.py b/django/utils/_os.py
index f7114af291..56ef0f2014 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).