From 4f4a0e0c524afcf0e82ff417620ed4dac9d83aab Mon Sep 17 00:00:00 2001
From: "Marshall T. Vandegrift" <llasram@gmail.com>
Date: Fri, 19 Dec 2008 00:46:37 -0500
Subject: [PATCH] The great file re-shuffling.

---
 setup.py                                       | 2 +-
 src/calibre/ebooks/lit/reader.py               | 2 +-
 src/calibre/ebooks/lit/writer.py               | 8 ++++----
 src/calibre/ebooks/{lit/oeb.py => oeb/base.py} | 0
 src/calibre/ebooks/{lit => oeb}/html.css       | 0
 src/calibre/ebooks/{lit => oeb}/stylizer.py    | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename src/calibre/ebooks/{lit/oeb.py => oeb/base.py} (100%)
 rename src/calibre/ebooks/{lit => oeb}/html.css (100%)
 rename src/calibre/ebooks/{lit => oeb}/stylizer.py (99%)

diff --git a/setup.py b/setup.py
index 457c51342d..5438dffd7a 100644
--- a/setup.py
+++ b/setup.py
@@ -146,7 +146,7 @@ if __name__ == '__main__':
             metadata_sqlite = 'library/metadata_sqlite.sql',
             jquery          = 'gui2/viewer/jquery.js',
             jquery_scrollTo = 'gui2/viewer/jquery_scrollTo.js',
-            html_css        = 'ebooks/lit/html.css',
+            html_css        = 'ebooks/oeb/html.css',
         )
         
         DEST = os.path.join('src', APPNAME, 'resources.py')
diff --git a/src/calibre/ebooks/lit/reader.py b/src/calibre/ebooks/lit/reader.py
index 8b8d37cd4d..0e7f9a1ccf 100644
--- a/src/calibre/ebooks/lit/reader.py
+++ b/src/calibre/ebooks/lit/reader.py
@@ -17,7 +17,7 @@ from lxml import etree
 from calibre.ebooks.lit import LitError
 from calibre.ebooks.lit.maps import OPF_MAP, HTML_MAP
 import calibre.ebooks.lit.mssha1 as mssha1
-from calibre.ebooks.lit.oeb import XML_PARSER, urlnormalize
+from calibre.ebooks.oeb.base import XML_PARSER, urlnormalize
 from calibre.ebooks import DRMError
 from calibre import plugins
 lzx, lxzerror = plugins['lzx']
diff --git a/src/calibre/ebooks/lit/writer.py b/src/calibre/ebooks/lit/writer.py
index f824e6aac3..6e2d079e1c 100644
--- a/src/calibre/ebooks/lit/writer.py
+++ b/src/calibre/ebooks/lit/writer.py
@@ -23,11 +23,11 @@ from urllib import unquote as urlunquote
 from lxml import etree
 from calibre.ebooks.lit.reader import DirectoryEntry
 import calibre.ebooks.lit.maps as maps
-from calibre.ebooks.lit.oeb import OEB_DOCS, OEB_STYLES, OEB_CSS_MIME, \
+from calibre.ebooks.oeb.base import OEB_DOCS, OEB_STYLES, OEB_CSS_MIME, \
     CSS_MIME, OPF_MIME, XML_NS, XML
-from calibre.ebooks.lit.oeb import namespace, barename, urlnormalize, xpath
-from calibre.ebooks.lit.oeb import FauxLogger, OEBBook
-from calibre.ebooks.lit.stylizer import Stylizer
+from calibre.ebooks.oeb.base import namespace, barename, urlnormalize, xpath
+from calibre.ebooks.oeb.base import FauxLogger, OEBBook
+from calibre.ebooks.oeb.stylizer import Stylizer
 from calibre.ebooks.lit.lzx import Compressor
 import calibre
 from calibre import LoggingInterface
diff --git a/src/calibre/ebooks/lit/oeb.py b/src/calibre/ebooks/oeb/base.py
similarity index 100%
rename from src/calibre/ebooks/lit/oeb.py
rename to src/calibre/ebooks/oeb/base.py
diff --git a/src/calibre/ebooks/lit/html.css b/src/calibre/ebooks/oeb/html.css
similarity index 100%
rename from src/calibre/ebooks/lit/html.css
rename to src/calibre/ebooks/oeb/html.css
diff --git a/src/calibre/ebooks/lit/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py
similarity index 99%
rename from src/calibre/ebooks/lit/stylizer.py
rename to src/calibre/ebooks/oeb/stylizer.py
index dbd10a320e..4bd828e47b 100644
--- a/src/calibre/ebooks/lit/stylizer.py
+++ b/src/calibre/ebooks/oeb/stylizer.py
@@ -21,8 +21,8 @@ import cssutils
 from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \
     CSSValueList, cssproperties
 from lxml import etree
-from calibre.ebooks.lit.oeb import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES
-from calibre.ebooks.lit.oeb import barename, urlnormalize
+from calibre.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES
+from calibre.ebooks.oeb.base import barename, urlnormalize
 from calibre.resources import html_css
 
 HTML_CSS_STYLESHEET = cssutils.parseString(html_css)