trailing whitespace

getnikola · May 9, 2015 · 086bc24 · 086bc24
1 parent 0bd330d
commit 086bc24
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -266,7 +266,6 @@ def __init__(self, **config):
         }
 
         self.strict = False
-        self.global_data = {}
         self.posts = []
         self.all_posts = []
         self.posts_per_year = defaultdict(list)
@@ -1362,7 +1361,6 @@ def scan_posts(self, really=False, ignore_quit=False, quiet=False):
             return
 
         # Reset things
-        self.global_data = {}
         self.posts = []
         self.all_posts = []
         self.posts_per_year = defaultdict(list)
@@ -1374,10 +1372,9 @@ def scan_posts(self, really=False, ignore_quit=False, quiet=False):
         self.pages = []
 
         for p in self.plugin_manager.getPluginsOfCategory('PostScanner'):
-            timeline, global_data = p.plugin_object.scan()
+            timeline = p.plugin_object.scan()
             # FIXME: can there be conflicts here?
             self.timeline.extend(timeline)
-            self.global_data.update(global_data)
 
         quit = False
         # Classify posts per year/tag/month/whatever

diff --git a/nikola/plugin_categories.py b/nikola/plugin_categories.py
@@ -89,7 +89,7 @@ def scan(self):
         """Creates a list of posts from some source. Returns timeline, global_data:
 
         timeline is a list of Post objects
-        global_data is a dictionary where keys are source paths and values are posts. 
+        global_data is a dictionary where keys are source paths and values are posts.
         """
         raise NotImplementedError()
 

diff --git a/nikola/plugins/task/scan_posts.py b/nikola/plugins/task/scan_posts.py
@@ -47,7 +47,6 @@ def scan(self):
             print("Scanning posts", end='', file=sys.stderr)
 
         timeline = []
-        global_data = {}
 
         for wildcard, destination, template_name, use_in_feeds in \
                 self.site.config['post_pages']:
@@ -97,6 +96,5 @@ def scan(self):
                         self.site.get_compiler(base_path)
                     )
                     timeline.append(post)
-                    global_data[post.source_path] = post
 
-        return timeline, global_data
+        return timeline