diff options
Diffstat (limited to 'django/utils')
| -rw-r--r-- | django/utils/_os.py | 4 | ||||
| -rw-r--r-- | django/utils/feedgenerator.py | 6 | ||||
| -rw-r--r-- | django/utils/html.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/django/utils/_os.py b/django/utils/_os.py index 11fc5afe49..1cf250e09e 100644 --- a/django/utils/_os.py +++ b/django/utils/_os.py @@ -74,8 +74,8 @@ def safe_join(base, *paths): # b) The final path must be the same as the base path. # c) The base path must be the most root path (meaning either "/" or "C:\\") if (not normcase(final_path).startswith(normcase(base_path + sep)) and - normcase(final_path) != normcase(base_path) and - dirname(normcase(base_path)) != normcase(base_path)): + normcase(final_path) != normcase(base_path) and + dirname(normcase(base_path)) != normcase(base_path)): raise ValueError('The joined path (%s) is located outside of the base ' 'path component (%s)' % (final_path, base_path)) return final_path diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py index 00d982025a..52c0ecca7f 100644 --- a/django/utils/feedgenerator.py +++ b/django/utils/feedgenerator.py @@ -113,9 +113,9 @@ class SyndicationFeed(object): self.items = [] def add_item(self, title, link, description, author_email=None, - author_name=None, author_link=None, pubdate=None, comments=None, - unique_id=None, unique_id_is_permalink=None, enclosure=None, - categories=(), item_copyright=None, ttl=None, updateddate=None, **kwargs): + author_name=None, author_link=None, pubdate=None, comments=None, + unique_id=None, unique_id_is_permalink=None, enclosure=None, + categories=(), item_copyright=None, ttl=None, updateddate=None, **kwargs): """ Adds an item to the feed. All args are expected to be Python Unicode objects except pubdate and updateddate, which are datetime.datetime diff --git a/django/utils/html.py b/django/utils/html.py index 3ad549de19..daced9a221 100644 --- a/django/utils/html.py +++ b/django/utils/html.py @@ -238,7 +238,7 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False): lead = lead + opening # Keep parentheses at the end only if they're balanced. if (middle.endswith(closing) - and middle.count(closing) == middle.count(opening) + 1): + and middle.count(closing) == middle.count(opening) + 1): middle = middle[:-len(closing)] trail = closing + trail |