From 8c0d2b20aee2edeb9bd8639ee7fb1887359e9797 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20St=C4=99pniowski?= <marek@stepniowski.com>
Date: Sat, 6 Sep 2008 15:45:46 +0200
Subject: [PATCH] Made dcparser a submodule of librarian. Fixed imports in
 application code.

---
 catalogue/models.py                     | 3 +--
 lib/dcparser/__init__.py                | 4 ----
 lib/{dcparser => librarian}/dcparser.py | 0
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 lib/dcparser/__init__.py
 rename lib/{dcparser => librarian}/dcparser.py (100%)

diff --git a/catalogue/models.py b/catalogue/models.py
index 0d3df1603..057236dc2 100644
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -10,7 +10,7 @@ from django.utils.safestring import mark_safe
 from newtagging.models import TagBase
 from newtagging import managers
 
-from librarian import html
+from librarian import html, dcparser
 
 
 TAG_CATEGORIES = (
@@ -128,7 +128,6 @@ class Book(models.Model):
     def from_xml_file(xml_file):
         from tempfile import NamedTemporaryFile
         from slughifi import slughifi
-        import dcparser
         from markupstring import MarkupString
         
         # Read book metadata
diff --git a/lib/dcparser/__init__.py b/lib/dcparser/__init__.py
deleted file mode 100644
index b92af61fe..000000000
--- a/lib/dcparser/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from dcparser import parse, ParseError, Person
-
diff --git a/lib/dcparser/dcparser.py b/lib/librarian/dcparser.py
similarity index 100%
rename from lib/dcparser/dcparser.py
rename to lib/librarian/dcparser.py
-- 
2.20.1