Python 2.x is long since deprecated.. let's use Python 3 for real thi…

…s time.

blogofile/argparse.py

@@ -1687,7 +1687,7 @@ def parse_known_args(self, args=None, namespace=None):
                 if not hasattr(namespace, action.dest):
                     if action.default is not SUPPRESS:
                         default = action.default
-                        if isinstance(action.default, basestring):
+                        if isinstance(action.default, str):
                             default = self._get_value(action, default)
                         setattr(namespace, action.dest, default)
 
@@ -2161,7 +2161,7 @@ def _get_values(self, action, arg_strings):
                 value = action.const
             else:
                 value = action.default
-            if isinstance(value, basestring):
+            if isinstance(value, str):
                 value = self._get_value(action, value)
                 self._check_value(action, value)
 

blogofile/command_completion.py

@@ -1,7 +1,7 @@
 import sys
 import shlex
 
-import argparse
+from . import argparse
 
 bash_bootstrap = """
 _blogofile_completion() {
@@ -18,7 +18,7 @@
 
 def get_subparsers(parser):
     if parser._subparsers:
-        subparsers = parser._subparsers._group_actions[0].choices.items()
+        subparsers = list(parser._subparsers._group_actions[0].choices.items())
     else:
         subparsers = []
     return subparsers
@@ -42,7 +42,7 @@ def print_completions(parser, command, current_word):
         for name, sub_subparser in get_subparsers(subparser):
             if name.startswith(current_word):
                 if name != current_word:
-                    print name + " "
+                    print(name + " ")
                     num_completions += 1
     finally:
         #Turn back on the default exit on error behaviour of argparse:

blogofile/config.py

@@ -10,14 +10,13 @@
 import logging
 import sys
 
-import util
-import writer
+from . import util
 import blogofile_bf as bf
-import cache
-import controller
-import plugin
-import site_init
-import filter
+from . import cache
+from . import controller
+from . import plugin
+from . import site_init
+from . import filter
 
 bf.config = sys.modules['blogofile.config']
 
@@ -49,7 +48,7 @@ def recompile():
     global site
     site.compiled_file_ignore_patterns = []
     for p in site.file_ignore_patterns:
-        if isinstance(p, basestring):
+        if isinstance(p, str):
             site.compiled_file_ignore_patterns.append(
                 re.compile(p, re.IGNORECASE))
         else:
@@ -69,12 +68,12 @@ def __load_config(path=None):
     filter.preload_filters()
     controller.load_controllers(namespace=bf.config.controllers)
     if path:
-        execfile(path)
+        exec(compile(open(path).read(), path, 'exec'))
     #config is now in locals() but needs to be in globals()
-    for k, v in locals().items():
+    for k, v in list(locals().items()):
         globals()[k] = v
     #Override any options (from unit tests)
-    for k, v in override_options.items():
+    for k, v in list(override_options.items()):
         if "." in k:
             parts = k.split(".")
             cache_object = ".".join(parts[:-1])

blogofile/controller.py

@@ -54,7 +54,7 @@
 import operator
 import logging
 
-from cache import bf
+from .cache import bf
 bf.controller = sys.modules['blogofile.controller']
 
 logger = logging.getLogger("blogofile.controller")
@@ -79,7 +79,7 @@ def __find_controller_names(directory="_controllers"):
 def init_controllers(namespace):
     """Controllers have an optional init method that runs before the run
     method"""
-    for controller in sorted(namespace.values(),
+    for controller in sorted(list(namespace.values()),
             key=operator.attrgetter("priority")):
         if "mod" in controller \
                 and type(controller.mod).__name__ == "module"\
@@ -107,23 +107,23 @@ def load_controller(name, namespace, directory="_controllers", defaults={}, is_p
             controller = __import__(name)
             controller.__initialized = False
             logger.debug("found controller: {0} - {1}".format(name,controller))
-        except (ImportError,),e:
+        except (ImportError,) as e:
             logger.error(
                 "Cannot import controller : {0} ({1})".format(name, e))
             raise
         # Remember the actual imported module
         namespace[name].mod = controller
         # Load the blogofile defaults for controllers:
-        for k, v in default_controller_config.items():
+        for k, v in list(default_controller_config.items()):
             namespace[name][k] = v
         # Load provided defaults:
-        for k, v in defaults.items():
+        for k, v in list(defaults.items()):
             namespace[name][k] = v
         if not is_plugin:
             # Load any of the controller defined defaults:
             try:
                 controller_config = getattr(controller, "config")
-                for k, v in controller_config.items():
+                for k, v in list(controller_config.items()):
                     if "." in k:
                         #This is a hierarchical setting
                         tail = namespace[name]
@@ -183,7 +183,7 @@ def defined_controllers(namespaces, only_enabled=True):
     """
     controllers = []
     for namespace in namespaces:
-        for c in namespace.controllers.values():
+        for c in list(namespace.controllers.values()):
             #Get only the ones that are enabled:
             if "enabled" not in c or c['enabled'] == False:
                 #The controller is disabled

blogofile/filter.py

@@ -4,13 +4,13 @@
 import imp
 import uuid
 
-import util
+from . import util
 
 logger = logging.getLogger("blogofile.filter")
 
-from cache import bf
-from cache import HierarchicalCache
-import exception
+from .cache import bf
+from .cache import HierarchicalCache
+from . import exception
 
 bf.filter = sys.modules['blogofile.filter']
 
@@ -25,8 +25,7 @@ def run_chain(chain, content):
     Works with either a string or a sequence of filters"""
     if chain is None: 
         return content
-    if not hasattr(chain, '__iter__'):
-        #Not a sequence, must be a string, parse it
+    if isinstance(chain, str):
         chain = parse_chain(chain)
     for fn in chain:
         f = get_filter(fn)
@@ -67,7 +66,7 @@ def init_filters(namespace=None):
     built"""
     if namespace is None:
         namespace=bf.config.filters
-    for name, filt in namespace.items():
+    for name, filt in list(namespace.items()):
         if "mod" in filt \
                 and type(filt.mod).__name__ == "module"\
                 and not filt.mod.__initialized:
@@ -84,7 +83,7 @@ def get_filter(name, namespace=None):
     #Return an already loaded filter:
     if namespace is None:
         namespace = bf.config.filters
-    if namespace.has_key(name) and namespace[name].has_key("mod"):
+    if name in namespace and "mod" in namespace[name]:
         logger.debug("Retrieving already loaded filter: " + name)
         return namespace[name]['mod']
     else:
@@ -128,12 +127,12 @@ def load_filter(name, module_path, namespace=None):
         except:
             pass
         #Load the default blogofile config for filters:
-        for k, v in default_filter_config.items():
+        for k, v in list(default_filter_config.items()):
             namespace[name][k] = v
         #Load any filter defined defaults:
         try:
             filter_config = getattr(mod, "config")
-            for k, v in filter_config.items():
+            for k, v in list(filter_config.items()):
                 if "." in k:
                     #This is a hierarchical setting
                     tail = namespace[name]

blogofile/main.py

@@ -30,19 +30,20 @@
 import sys
 import shlex
 import time
+import platform
 
-import argparse
+from . import argparse
 
-from cache import bf
-from writer import Writer
-import server
-import config
-import site_init
-import util
-import plugin
-import site_init
-from exception import *
-import command_completion
+from .cache import bf
+from .writer import Writer
+from . import server
+from . import config
+from . import site_init
+from . import util
+from . import plugin
+from . import site_init
+from .exception import *
+from . import command_completion
 
 locale.setlocale(locale.LC_ALL, '')
 
@@ -66,8 +67,9 @@ def setup_command_parser():
                                  help="Be extra verbose")
     global parser, subparsers
     parser = argparse.ArgumentParser(parents=[parser_template])
-    parser.version = "Blogofile {0} -- http://www.blogofile.com".format(
-            __version__)
+    parser.version = "Blogofile {0} -- http://www.Blogofile.com -- {1} {2}"\
+        .format( __version__,platform.python_implementation(),
+                 platform.python_version())
     subparsers = parser.add_subparsers()
 
     p_help = subparsers.add_parser("help", help="Show help for a command.",
@@ -146,15 +148,15 @@ def find_src_root(path=os.curdir):
         path = parts[0]
 
 def do_completion(cmd):
-    if os.environ.has_key("BLOGOFILE_BASH_BOOTSTRAP"):
-        print command_completion.bash_bootstrap
+    if "BLOGOFILE_BASH_BOOTSTRAP" in os.environ:
+        print(command_completion.bash_bootstrap)
         sys.exit(1)
-    if os.environ.has_key("BLOGOFILE_COMPLETION_MODE"):
+    if "BLOGOFILE_COMPLETION_MODE" in os.environ:
         #Complete the current Blogofile command rather than run it:
         command_completion.complete(parser, cmd)
         sys.exit(1)
 
-def main(cmd=None):        
+def main(cmd=None):
     do_debug()
     parser = setup_command_parser()
     do_completion(cmd)
@@ -176,7 +178,7 @@ def main(cmd=None):
             args.src_dir = os.path.abspath(os.curdir)
             #Not a valid src dir, the next block warns the user
     if not args.src_dir or not os.path.isdir(args.src_dir):
-        print("source dir does not exist : %s" % args.src_dir)
+        print(("source dir does not exist : %s" % args.src_dir))
         sys.exit(1)
     os.chdir(args.src_dir)
 
@@ -189,7 +191,7 @@ def main(cmd=None):
 def do_bash_complete(args):
     for subcommand in args.command:
         parser = subparsers.choices[subcommand]
-        print parser
+        print(parser)
 
 def do_help(args):
     global parser
@@ -214,11 +216,11 @@ def do_help(args):
 
         # Print help for each subcommand requested.
         for subcommand in args.command:
-            print >>sys.stderr, "{0} - {1}".format(
-                    subcommand, helptext[subcommand])
+            print("{0} - {1}".format(
+                    subcommand, helptext[subcommand]), file=sys.stderr)
             parser = subparsers.choices[subcommand]
             parser.print_help()
-            print >>sys.stderr, "\n"
+            print("\n", file=sys.stderr)
             #Perform any extra help tasks:
             if hasattr(parser, "extra_help"):
                 parser.extra_help()
@@ -229,8 +231,7 @@ def config_init(args):
         # We already changed to the directory specified with --src-dir
         config.init("_config.py")
     except config.ConfigNotFoundException:
-        print >>sys.stderr, \
-                "No configuration found in source dir: {0}".format(args.src_dir)
+        print("No configuration found in source dir: {0}".format(args.src_dir), file=sys.stderr)
         parser.exit(1, "Want to make a new site? Try `blogofile init`\n")
 
 
@@ -283,16 +284,16 @@ def do_debug():
 
 def do_info(args):
     """Print some information about the Blogofile installation and the current site"""
-    print("This is Blogofile (version {0}) -- http://www.blogofile.com".\
-        format(__version__))
+    print(("This is Blogofile (version {0}) -- http://www.blogofile.com".\
+        format(__version__)))
     print("")
     ### Show _config.py paths
-    print("Default config file: {0}".format(config.default_config_path()))
+    print(("Default config file: {0}".format(config.default_config_path())))
     print("(Override these default settings in your own _config.py, don't edit "
           "the file above.)")
     print("")
     if os.path.isfile("_config.py"):
-        print("Found site _config.py: {0}".format(os.path.abspath("_config.py")))
+        print(("Found site _config.py: {0}".format(os.path.abspath("_config.py"))))
     else:
         print("The specified directory has no _config.py")