From 492915a94dbf9bfac6cb66dfd345fd1ac06cefc0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 23 Aug 2012 11:54:07 +0530
Subject: [PATCH] ...

---
 src/calibre/devices/mtp/driver.py       | 20 ++++++++++++++++++++
 src/calibre/devices/mtp/test.py         | 22 ++++++++++++++++++++++
 src/calibre/devices/mtp/unix/libmtp.c   |  2 ++
 src/calibre/devices/mtp/windows/wpd.cpp |  3 +++
 4 files changed, 47 insertions(+)
 create mode 100644 src/calibre/devices/mtp/driver.py
 create mode 100644 src/calibre/devices/mtp/test.py

diff --git a/src/calibre/devices/mtp/driver.py b/src/calibre/devices/mtp/driver.py
new file mode 100644
index 0000000000..54827d234a
--- /dev/null
+++ b/src/calibre/devices/mtp/driver.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__   = 'GPL v3'
+__copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+from calibre.constants import iswindows
+
+if iswindows:
+    from calibre.devices.mtp.windows.driver import MTP_DEVICE as BASE
+    BASE
+else:
+    from calibre.devices.mtp.unix.driver import MTP_DEVICE as BASE
+
+class MTP_DEVICE(BASE):
+    pass
+
diff --git a/src/calibre/devices/mtp/test.py b/src/calibre/devices/mtp/test.py
new file mode 100644
index 0000000000..6595a330d4
--- /dev/null
+++ b/src/calibre/devices/mtp/test.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__   = 'GPL v3'
+__copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import unittest
+
+from calibre.devices.mtp.driver import MTP_DEVICE
+
+class Test(unittest.TestCase):
+
+    def setUp(self):
+        self.dev = MTP_DEVICE(None)
+
+    def tearDown(self):
+        pass
+
+
diff --git a/src/calibre/devices/mtp/unix/libmtp.c b/src/calibre/devices/mtp/unix/libmtp.c
index ffab2e8b30..1c92e6d13f 100644
--- a/src/calibre/devices/mtp/unix/libmtp.c
+++ b/src/calibre/devices/mtp/unix/libmtp.c
@@ -777,8 +777,10 @@ initlibmtp(void) {
     
     m = Py_InitModule3("libmtp", libmtp_methods, "Interface to libmtp.");
     if (m == NULL) return;
+
     MTPError = PyErr_NewException("libmtp.MTPError", NULL, NULL);
     if (MTPError == NULL) return;
+    PyModule_AddObject(m, "MTPError", MTPError);
 
     LIBMTP_Init();
     LIBMTP_Set_Debug(LIBMTP_DEBUG_NONE);
diff --git a/src/calibre/devices/mtp/windows/wpd.cpp b/src/calibre/devices/mtp/windows/wpd.cpp
index 51a55b97ac..a306fa00c4 100644
--- a/src/calibre/devices/mtp/windows/wpd.cpp
+++ b/src/calibre/devices/mtp/windows/wpd.cpp
@@ -195,12 +195,15 @@ initwpd(void) {
 
     WPDError = PyErr_NewException("wpd.WPDError", NULL, NULL);
     if (WPDError == NULL) return;
+    PyModule_AddObject(m, "WPDError", MTPError);
 
     NoWPD = PyErr_NewException("wpd.NoWPD", NULL, NULL);
     if (NoWPD == NULL) return;
+    PyModule_AddObject(m, "NoWPD", MTPError);
 
     WPDFileBusy = PyErr_NewException("wpd.WPDFileBusy", NULL, NULL);
     if (WPDFileBusy == NULL) return;
+    PyModule_AddObject(m, "WPDFileBusy", MTPError);
 
     Py_INCREF(&DeviceType);
     PyModule_AddObject(m, "Device", (PyObject *)&DeviceType);