From 668fc7a2110dd3e38742d4f38c28bdfdd9d686fd Mon Sep 17 00:00:00 2001
From: Jim Miller <retiefjimm@gmail.com>
Date: Tue, 16 Oct 2012 11:04:10 -0500
Subject: [PATCH] No logging.NullHandler in P2.5, switch grangerenchanted from
 StoneSoup.

---
 downloader.py                                   | 15 ++++++++-------
 fanficdownloader/__init__.py                    | 17 +++++++++--------
 .../adapters/adapter_grangerenchantedcom.py     |  4 ++--
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/downloader.py b/downloader.py
index 4d718b0..ca7dc3f 100644
--- a/downloader.py
+++ b/downloader.py
@@ -15,13 +15,6 @@
 # limitations under the License.
 #
 
-import logging
-# suppresses default logger.  Logging is setup in fanficdownload/__init__.py so it works in calibre, too.
-logger = logging.getLogger()
-loghandler=logging.NullHandler()
-loghandler.setFormatter(logging.Formatter("(=====)(levelname)s:%(message)s"))
-logger.addHandler(loghandler)
-
 import sys, os
 from os.path import normpath, expanduser, isfile, join
 from StringIO import StringIO
@@ -31,6 +24,14 @@ import string
 import ConfigParser
 from subprocess import call
 
+import logging
+if sys.version_info >= (2, 7):
+    # suppresses default logger.  Logging is setup in fanficdownload/__init__.py so it works in calibre, too.
+    rootlogger = logging.getLogger()
+    loghandler=logging.NullHandler()
+    loghandler.setFormatter(logging.Formatter("(=====)(levelname)s:%(message)s"))
+    rootlogger.addHandler(loghandler)
+
 from fanficdownloader import adapters,writers,exceptions
 from fanficdownloader.configurable import Configuration
 from fanficdownloader.epubutils import get_dcsource_chaptercount, get_update_data
diff --git a/fanficdownloader/__init__.py b/fanficdownloader/__init__.py
index c55670d..93a4d07 100644
--- a/fanficdownloader/__init__.py
+++ b/fanficdownloader/__init__.py
@@ -4,12 +4,13 @@ try:
     # just a way to switch between web service and CLI/PI
     import google.appengine.api 
 except:
-
-    import logging
-    logger = logging.getLogger(__name__)
-    loghandler=logging.StreamHandler()
-    loghandler.setFormatter(logging.Formatter("FFDL:%(levelname)s:%(filename)s(%(lineno)d):%(message)s"))
-    logger.addHandler(loghandler)
-    loghandler.setLevel(logging.DEBUG)
-    logger.setLevel(logging.DEBUG)
+    import sys
+    if sys.version_info >= (2, 7):
+        import logging
+        logger = logging.getLogger(__name__)
+        loghandler=logging.StreamHandler()
+        loghandler.setFormatter(logging.Formatter("FFDL:%(levelname)s:%(filename)s(%(lineno)d):%(message)s"))
+        logger.addHandler(loghandler)
+        loghandler.setLevel(logging.DEBUG)
+        logger.setLevel(logging.DEBUG)
 
diff --git a/fanficdownloader/adapters/adapter_grangerenchantedcom.py b/fanficdownloader/adapters/adapter_grangerenchantedcom.py
index 24ece0e..dd4723f 100644
--- a/fanficdownloader/adapters/adapter_grangerenchantedcom.py
+++ b/fanficdownloader/adapters/adapter_grangerenchantedcom.py
@@ -287,8 +287,8 @@ class GrangerEnchantedCom(BaseSiteAdapter):
 
         logger.debug('Getting chapter text from: %s' % url)
 
-        soup = bs.BeautifulStoneSoup(self._fetchUrl(url),
-                                     selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
+        soup = bs.BeautifulSoup(self._fetchUrl(url),
+                                selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
         
         div = soup.find('div', {'id' : 'story1'})