changeset 183:f940cdefe537

Code cleanup.
author Ludovic Chabant <ludovic@chabant.com>
date Sat, 01 Feb 2014 14:04:13 -0800
parents 7533ffec1b5a
children 557d1fba2d9f
files wikked/page.py
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/wikked/page.py	Sat Feb 01 14:04:01 2014 -0800
+++ b/wikked/page.py	Sat Feb 01 14:04:13 2014 -0800
@@ -129,13 +129,13 @@
     def _ensureExtendedData(self):
         if self._data is not None and self._data.has_extended_data:
             return
-    
+
         self._ensureData()
 
         self._onExtendedDataLoading()
         if self._data.has_extended_data and not self._force_resolve:
             return
-        
+
         try:
             r = PageResolver(self)
             out = r.run()
@@ -202,9 +202,8 @@
         data.local_links = ctx.out_links
 
         # Add some common meta.
-        data.title = re.sub(r'\-', ' ', filename_split[0])
-        if 'title' in data.local_meta:
-            data.title = data.local_meta['title']
+        data.title = (data.local_meta.get('title') or
+                re.sub(r'\-', ' ', filename_split[0]))
 
         return data