From c196a56d6ca13230cdb24b046a549a3e521437d4 Mon Sep 17 00:00:00 2001
From: Lakshmi Vyasarajan <lakshmi.vyas@gmail.com>
Date: Fri, 14 Jan 2011 14:38:10 +0530
Subject: [PATCH] Renamed logging to util. hyde is now 2.6 compatible

---
 dev-req.txt                  | 2 +-
 hyde/ext/plugins/less.py     | 2 +-
 hyde/fs.py                   | 2 +-
 hyde/generator.py            | 2 +-
 hyde/loader.py               | 2 +-
 hyde/plugin.py               | 2 +-
 hyde/site.py                 | 2 +-
 hyde/template.py             | 2 +-
 hyde/{logging.py => util.py} | 1 +
 9 files changed, 9 insertions(+), 8 deletions(-)
 rename hyde/{logging.py => util.py} (96%)

diff --git a/dev-req.txt b/dev-req.txt
index a6b6df3..502c474 100644
--- a/dev-req.txt
+++ b/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
diff --git a/hyde/ext/plugins/less.py b/hyde/ext/plugins/less.py
index 5d15f6a..d78fac6 100644
--- a/hyde/ext/plugins/less.py
+++ b/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)
diff --git a/hyde/fs.py b/hyde/fs.py
index f69f9e9..3c6fbde 100644
--- a/hyde/fs.py
+++ b/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')
 
diff --git a/hyde/generator.py b/hyde/generator.py
index 5ea99f8..b3bc144 100644
--- a/hyde/generator.py
+++ b/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')
 
 
diff --git a/hyde/loader.py b/hyde/loader.py
index 5beb9ca..2a173cd 100644
--- a/hyde/loader.py
+++ b/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 = {}
diff --git a/hyde/plugin.py b/hyde/plugin.py
index 823a0a4..8020dc8 100644
--- a/hyde/plugin.py
+++ b/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):
     """
diff --git a/hyde/site.py b/hyde/site.py
index 2cbc598..2919f6f 100644
--- a/hyde/site.py
+++ b/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')
diff --git a/hyde/template.py b/hyde/template.py
index 7d5debb..07eea67 100644
--- a/hyde/template.py
+++ b/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):
     """
diff --git a/hyde/logging.py b/hyde/util.py
similarity index 96%
rename from hyde/logging.py
rename to hyde/util.py
index 64d191c..f42c4b3 100644
--- a/hyde/logging.py
+++ b/hyde/util.py
@@ -23,3 +23,4 @@ def getLoggerWithNullHandler(logger_name):
     """
     logger = logging.getLogger(logger_name)
     logger.addHandler(NullHandler())
+    return logger