Imported Upstream version 5.1upstream/5.1

1 files changed, 33 insertions, 4 deletions

diff --git a/nikola/plugins/command_serve.py b/nikola/plugins/command_serve.py
index 626b117..628bba0 100644
--- a/nikola/plugins/command_serve.py
+++ b/nikola/plugins/command_serve.py
@@ -1,7 +1,36 @@
+# Copyright (c) 2012 Roberto Alsina y otros.
+
+# Permission is hereby granted, free of charge, to any
+# person obtaining a copy of this software and associated
+# documentation files (the "Software"), to deal in the
+# Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the
+# Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice
+# shall be included in all copies or substantial portions of
+# the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+# OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+from __future__ import print_function
 from optparse import OptionParser
 import os
-from BaseHTTPServer import HTTPServer
-from SimpleHTTPServer import SimpleHTTPRequestHandler
+try:
+    from BaseHTTPServer import HTTPServer
+    from SimpleHTTPServer import SimpleHTTPRequestHandler
+except ImportError:
+    from http.server import HTTPServer
+    from http.server import SimpleHTTPRequestHandler
 
 from nikola.plugin_categories import Command
 
@@ -25,13 +54,13 @@ class CommandBuild(Command):
 
         out_dir = self.site.config['OUTPUT_FOLDER']
         if not os.path.isdir(out_dir):
-            print "Error: Missing '%s' folder?" % out_dir
+            print("Error: Missing '%s' folder?" % out_dir)
         else:
             os.chdir(out_dir)
             httpd = HTTPServer((options.address, options.port),
                 OurHTTPRequestHandler)
             sa = httpd.socket.getsockname()
-            print "Serving HTTP on", sa[0], "port", sa[1], "..."
+            print("Serving HTTP on", sa[0], "port", sa[1], "...")
             httpd.serve_forever()