Renamed logging to util. hyde is now 2.6 compatible

dev-req.txt

@@ -1,10 +1,10 @@
+# argparse - needed for 2.6
 commando==0.1.1a
 PyYAML==3.09
 Markdown==2.0.3
 MarkupSafe==0.11
 smartypants==1.6.0.3
 -e git://github.com/hydepy/typogrify.git#egg=typogrify
-Django==1.2.3
 Jinja2==2.5.5
 pyquery==0.6.1
 unittest2==0.5.1

hyde/ext/plugins/less.py

@@ -72,7 +72,7 @@ class LessCSSPlugin(Plugin):
         source = File.make_temp(text)
         target = File.make_temp('')
         try:
-            subprocess.check_output([str(less), str(source), str(target)])
+            subprocess.check_call([str(less), str(source), str(target)])
         except subprocess.CalledProcessError, error:
             self.logger.error(traceback.format_exc())
             self.logger.error(error.output)

hyde/fs.py

@@ -13,7 +13,7 @@ import shutil
 from distutils import dir_util
 import functools
 
-from hyde.logging import getLoggerWithNullHandler
+from hyde.util import getLoggerWithNullHandler
 
 logger = getLoggerWithNullHandler('fs')
 

hyde/generator.py

@@ -8,7 +8,7 @@ from hyde.template import Template
 
 from contextlib import contextmanager
 
-from hyde.logging import getLoggerWithNullHandler
+from hyde.util import getLoggerWithNullHandler
 logger = getLoggerWithNullHandler('hyde.engine')
 
 

hyde/loader.py

@@ -5,7 +5,7 @@ import sys
 
 from hyde.exceptions import HydeException
 
-from hyde.logging import getLoggerWithNullHandler
+from hyde.util import getLoggerWithNullHandler
 logger = getLoggerWithNullHandler('hyde.engine')
 
 plugins = {}

hyde/plugin.py

@@ -5,7 +5,7 @@ Contains definition for a plugin protocol and other utiltities.
 import abc
 from hyde import loader
 
-from hyde.logging import getLoggerWithNullHandler
+from hyde.util import getLoggerWithNullHandler
 
 class Plugin(object):
     """

hyde/site.py

@@ -7,7 +7,7 @@ from hyde.exceptions import HydeException
 from hyde.fs import FS, File, Folder
 from hyde.model import Config
 
-from hyde.logging import getLoggerWithNullHandler
+from hyde.util import getLoggerWithNullHandler
 
 
 logger = getLoggerWithNullHandler('hyde.engine')

hyde/template.py

@@ -5,7 +5,7 @@ Abstract classes and utilities for template engines
 """
 from hyde.exceptions import HydeException
 
-from hyde.logging import getLoggerWithNullHandler
+from hyde.util import getLoggerWithNullHandler
 
 class Template(object):
     """

hyde/logging.py → hyde/util.py

@@ -23,3 +23,4 @@ def getLoggerWithNullHandler(logger_name):
     """
     logger = logging.getLogger(logger_name)
     logger.addHandler(NullHandler())
+    return logger