From 94a3968d69c30c54ea60939a5a84c5bac33601bb Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Thu, 5 Mar 2015 22:00:27 +0100 Subject: [PATCH] Untangle logic a bit --- flask/helpers.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/flask/helpers.py b/flask/helpers.py index a78cb18e..47661b1d 100644 --- a/flask/helpers.py +++ b/flask/helpers.py @@ -802,11 +802,10 @@ class _PackageBoundObject(object): del _get_static_folder, _set_static_folder def _get_static_url_path(self): - if self._static_url_path is None: - if self.static_folder is None: - return None + if self._static_url_path is not None: + return self._static_url_path + if self.static_folder is not None: return '/' + os.path.basename(self.static_folder) - return self._static_url_path def _set_static_url_path(self, value): self._static_url_path = value static_url_path = property(_get_static_url_path, _set_static_url_path)