From 251caa3c7d23da5cb60927559c1fd507c4ca53b7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 25 Jan 2014 20:40:07 +0530
Subject: [PATCH] Refactor all the diff code into a single dir

---
 setup/extensions.py                                    |  2 +-
 .../{utils => gui2/tweak_book}/diff/__init__.py        |  0
 .../{utils => gui2/tweak_book}/diff/_patiencediff_c.c  |  0
 src/calibre/gui2/tweak_book/diff/main.py               | 10 ++++++++++
 src/calibre/gui2/tweak_book/{diff.py => diff/view.py}  |  0
 5 files changed, 11 insertions(+), 1 deletion(-)
 rename src/calibre/{utils => gui2/tweak_book}/diff/__init__.py (100%)
 rename src/calibre/{utils => gui2/tweak_book}/diff/_patiencediff_c.c (100%)
 create mode 100644 src/calibre/gui2/tweak_book/diff/main.py
 rename src/calibre/gui2/tweak_book/{diff.py => diff/view.py} (100%)

diff --git a/setup/extensions.py b/setup/extensions.py
index 74ff5a88db..231aae4ee6 100644
--- a/setup/extensions.py
+++ b/setup/extensions.py
@@ -90,7 +90,7 @@ extensions = [
         ),
 
     Extension('_patiencediff_c',
-        ['calibre/utils/diff/_patiencediff_c.c'],
+        ['calibre/gui2/tweak_book/diff/_patiencediff_c.c'],
         ),
 
     Extension('icu',
diff --git a/src/calibre/utils/diff/__init__.py b/src/calibre/gui2/tweak_book/diff/__init__.py
similarity index 100%
rename from src/calibre/utils/diff/__init__.py
rename to src/calibre/gui2/tweak_book/diff/__init__.py
diff --git a/src/calibre/utils/diff/_patiencediff_c.c b/src/calibre/gui2/tweak_book/diff/_patiencediff_c.c
similarity index 100%
rename from src/calibre/utils/diff/_patiencediff_c.c
rename to src/calibre/gui2/tweak_book/diff/_patiencediff_c.c
diff --git a/src/calibre/gui2/tweak_book/diff/main.py b/src/calibre/gui2/tweak_book/diff/main.py
new file mode 100644
index 0000000000..3adfa10d58
--- /dev/null
+++ b/src/calibre/gui2/tweak_book/diff/main.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__ = 'GPL v3'
+__copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
+
diff --git a/src/calibre/gui2/tweak_book/diff.py b/src/calibre/gui2/tweak_book/diff/view.py
similarity index 100%
rename from src/calibre/gui2/tweak_book/diff.py
rename to src/calibre/gui2/tweak_book/diff/view.py