Untangle logic a bit

KWinston · Mar 5, 2015 · 94a3968 · 94a3968
1 parent 0748e2d
commit 94a3968
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/flask/helpers.py b/flask/helpers.py
@@ -802,11 +802,10 @@ def _set_static_folder(self, value):
     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)