New upstream version 7.8.1upstream/7.8.1

1 files changed, 11 insertions, 7 deletions

diff --git a/nikola/plugins/command/auto/__init__.py b/nikola/plugins/command/auto/__init__.py
index e339c06..a82dc3e 100644
--- a/nikola/plugins/command/auto/__init__.py
+++ b/nikola/plugins/command/auto/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2012-2015 Roberto Alsina and others.
+# Copyright © 2012-2016 Roberto Alsina and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -43,6 +43,7 @@ except ImportError:
 import webbrowser
 from wsgiref.simple_server import make_server
 import wsgiref.util
+import pkg_resources
 
 from blinker import signal
 try:
@@ -61,7 +62,6 @@ except ImportError:
     FileSystemEventHandler = object
     PatternMatchingEventHandler = object
 
-
 from nikola.plugin_categories import Command
 from nikola.utils import dns_sd, req_missing, get_logger, get_theme_path, STDERR_HANDLER
 LRJS_PATH = os.path.join(os.path.dirname(__file__), 'livereload.js')
@@ -102,7 +102,7 @@ class CommandAuto(Command):
             'long': 'address',
             'type': str,
             'default': '127.0.0.1',
-            'help': 'Address to bind (default: 127.0.0.1 – localhost)',
+            'help': 'Address to bind (default: 127.0.0.1 -- localhost)',
         },
         {
             'name': 'browser',
@@ -143,7 +143,7 @@ class CommandAuto(Command):
 
         self.cmd_arguments = ['nikola', 'build']
         if self.site.configuration_filename != 'conf.py':
-            self.cmd_arguments = ['--conf=' + self.site.configuration_filename] + self.cmd_arguments
+            self.cmd_arguments.append('--conf=' + self.site.configuration_filename)
 
         # Run an initial build so we are up-to-date
         subprocess.call(self.cmd_arguments)
@@ -157,7 +157,7 @@ class CommandAuto(Command):
 
         # Do not duplicate entries -- otherwise, multiple rebuilds are triggered
         watched = set([
-            'templates/', 'plugins/',
+            'templates/'
         ] + [get_theme_path(name) for name in self.site.THEMES])
         for item in self.site.config['post_pages']:
             watched.add(os.path.dirname(item[0]))
@@ -167,6 +167,10 @@ class CommandAuto(Command):
             watched.add(item)
         for item in self.site.config['LISTINGS_FOLDERS']:
             watched.add(item)
+        for item in self.site._plugin_places:
+            watched.add(item)
+        # Nikola itself (useful for developers)
+        watched.add(pkg_resources.resource_filename('nikola', ''))
 
         out_folder = self.site.config['OUTPUT_FOLDER']
         if options and options.get('browser'):
@@ -298,8 +302,8 @@ class CommandAuto(Command):
         mimetype = 'text/html' if uri.endswith('/') else mimetypes.guess_type(uri)[0] or 'application/octet-stream'
 
         if os.path.isdir(f_path):
-            if not f_path.endswith('/'):  # Redirect to avoid breakage
-                start_response('301 Redirect', [('Location', p_uri.path + '/')])
+            if not p_uri.path.endswith('/'):  # Redirect to avoid breakage
+                start_response('301 Moved Permanently', [('Location', p_uri.path + '/')])
                 return []
             f_path = os.path.join(f_path, self.site.config['INDEX_FILE'])
             mimetype = 'text/html'