Merge fixes from Mary Gardiner

planet/config.py

@@ -7,7 +7,7 @@ the structure of the ini file, to knowledge of data types, even down to
 what are the defaults.
 
 Usage:
-  from planet import config
+  import config
   config.load('config.ini')
 
   # administrative / structural information
@@ -35,7 +35,7 @@ planet_predefined_options = []
 
 def __init__():
     """define the struture of an ini file"""
-    from planet import config
+    import config
 
     def get(section, option, default):
         if section and parser.has_option(section, option):
@@ -95,7 +95,7 @@ def planet_options():
 
 def feed_options(section):
     """ dictionary of feed specific options"""
-    from planet import config
+    import config
     options = dict([(key,value) for key,value in planet_options().items()
         if key not in planet_predefined_options])
     if parser.has_section(section):

planet/spider.py

@@ -3,8 +3,10 @@ Fetch either a single feed, or a set of feeds, normalize to Atom and XHTML,
 and write each as a set of entries in a cache directory.
 """
 
-from planet import config, feedparser, reconstitute
+# Standard library modules
 import time, calendar, re, os
+# Planet modules
+import config, feedparser, reconstitute
 
 try:
     from xml.dom.ext import PrettyPrint

planet/splice.py

@@ -1,7 +1,7 @@
 """ Splice together a planet from a cache of feed entries """
 import glob, os
-from planet import config
 from xml.dom import minidom
+import config
 from reconstitute import createTextElement
 
 def splice(configFile):