From aa86f74c32dd1f60499275043bbc9fc4a295f1f9 Mon Sep 17 00:00:00 2001
From: echel0n <justin.tabish@gmail.com>
Date: Sat, 12 Apr 2014 15:24:51 -0700
Subject: [PATCH] Moved configobj lib into its own folder and fixed imports for
 our config class to reflect the new path of the lib.

---
 lib/configobj/__init__.py        |  1 +
 lib/configobj/_version.py        |  1 +
 lib/{ => configobj}/configobj.py |  3 ++-
 lib/{ => configobj}/six.py       |  0
 lib/{ => configobj}/validate.py  |  0
 nzbtomedia/nzbToMediaConfig.py   | 13 ++++++-------
 6 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 lib/configobj/__init__.py
 create mode 100644 lib/configobj/_version.py
 rename lib/{ => configobj}/configobj.py (99%)
 rename lib/{ => configobj}/six.py (100%)
 rename lib/{ => configobj}/validate.py (100%)

diff --git a/lib/configobj/__init__.py b/lib/configobj/__init__.py
new file mode 100644
index 00000000..f47233c8
--- /dev/null
+++ b/lib/configobj/__init__.py
@@ -0,0 +1 @@
+from .configobj import *
\ No newline at end of file
diff --git a/lib/configobj/_version.py b/lib/configobj/_version.py
new file mode 100644
index 00000000..742c20e4
--- /dev/null
+++ b/lib/configobj/_version.py
@@ -0,0 +1 @@
+__version__ = '5.0.4'
\ No newline at end of file
diff --git a/lib/configobj.py b/lib/configobj/configobj.py
similarity index 99%
rename from lib/configobj.py
rename to lib/configobj/configobj.py
index 26b7fd08..d730a13f 100644
--- a/lib/configobj.py
+++ b/lib/configobj/configobj.py
@@ -20,6 +20,7 @@ import sys
 from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF16_BE, BOM_UTF16_LE
 
 import six
+from _version import __version__
 
 # imported lazily to avoid startup performance hit if it isn't used
 compiler = None
@@ -1233,7 +1234,7 @@ class ConfigObj(Section):
             self.filename = infile
             if os.path.isfile(infile):
                 with open(infile, 'rb') as h:
-                    content = h.read() or []
+                    content = h.readlines() or []
             elif self.file_error:
                 # raise an error if the file doesn't exist
                 raise IOError('Config file not found: "%s".' % self.filename)
diff --git a/lib/six.py b/lib/configobj/six.py
similarity index 100%
rename from lib/six.py
rename to lib/configobj/six.py
diff --git a/lib/validate.py b/lib/configobj/validate.py
similarity index 100%
rename from lib/validate.py
rename to lib/configobj/validate.py
diff --git a/nzbtomedia/nzbToMediaConfig.py b/nzbtomedia/nzbToMediaConfig.py
index f24227e9..4b20a72b 100644
--- a/nzbtomedia/nzbToMediaConfig.py
+++ b/nzbtomedia/nzbToMediaConfig.py
@@ -1,7 +1,7 @@
 import os
 import shutil
 import nzbtomedia
-import lib.configobj
+from lib.configobj import *
 from itertools import chain
 
 class Sections(dict):
@@ -34,7 +34,7 @@ class Sections(dict):
                 to_return.update({section:{key:dict.__getitem__(subsection, key)}})
         return to_return
 
-class Section(lib.configobj.Section):
+class Section(configobj.Section):
     def isenabled(section):
         # checks if subsection enabled, returns true/false if subsection specified otherwise returns true/false in {}
         if section:
@@ -60,11 +60,11 @@ class Section(lib.configobj.Section):
                 result.update({section: subsection})
         return result
 
-class ConfigObj(lib.configobj.ConfigObj, Section):
+class ConfigObj(configobj.ConfigObj, Section):
     def __init__(self, *args, **kw):
         if len(args) == 0:
             args = (nzbtomedia.CONFIG_FILE,)
-        super(lib.configobj.ConfigObj, self).__init__(*args, **kw)
+        super(configobj.ConfigObj, self).__init__(*args, **kw)
         self.interpolation = False
 
     @staticmethod
@@ -331,7 +331,6 @@ class ConfigObj(lib.configobj.ConfigObj, Section):
         CFG_NEW.write()
         CFG_NEW.clear()
 
-
-lib.configobj.Section = Section
-lib.configobj.ConfigObj = ConfigObj
+configobj.Section = Section
+configobj.ConfigObj = ConfigObj
 config = ConfigObj