Change libtorrent import behaviour to first try importing deluge.libtorrent and then libtorrent. It will now also raise an ImportError if libtorrent version is not 0.14.

deluge/core/alertmanager.py

@@ -28,7 +28,13 @@
 import gobject
 
 import deluge.component as component
-import deluge.libtorrent as lt
+try:
+    import deluge.libtorrent as lt
+except ImportError:
+    import libtorrent as lt
+    if not (libtorrent.version_major == 0 and libtorrent.version_minor == 14):
+        raise ImportError("This version of Deluge requires libtorrent 0.14!")
+
 from deluge.log import LOG as log
 
 class AlertManager(component.Component):

deluge/core/autoadd.py

@@ -26,9 +26,12 @@
 import os
 
 try:
-    import libtorrent as lt
-except ImportError:
     import deluge.libtorrent as lt
+except ImportError:
+    import libtorrent as lt
+    if not (libtorrent.version_major == 0 and libtorrent.version_minor == 14):
+        raise ImportError("This version of Deluge requires libtorrent 0.14!")
+
 import deluge.component as component
 from deluge.configmanager import ConfigManager
 from deluge.log import LOG as log

deluge/core/core.py

@@ -40,9 +40,12 @@ import threading
 import socket
 
 try:
-    import libtorrent as lt
-except ImportError:
     import deluge.libtorrent as lt
+except ImportError:
+    import libtorrent as lt
+    if not (libtorrent.version_major == 0 and libtorrent.version_minor == 14):
+        raise ImportError("This version of Deluge requires libtorrent 0.14!")
+
 import deluge.configmanager
 import deluge.common
 import deluge.component as component

deluge/core/oldstateupgrader.py

@@ -30,9 +30,12 @@ import cPickle
 import shutil
 
 try:
-    import libtorrent as lt
-except ImportError:
     import deluge.libtorrent as lt
+except ImportError:
+    import libtorrent as lt
+    if not (libtorrent.version_major == 0 and libtorrent.version_minor == 14):
+        raise ImportError("This version of Deluge requires libtorrent 0.14!")
+
 from deluge.configmanager import ConfigManager
 import deluge.core.torrentmanager
 from deluge.log import LOG as log

deluge/core/preferencesmanager.py

@@ -28,9 +28,12 @@ import threading
 import gobject
 
 try:
-    import libtorrent as lt
-except ImportError:
     import deluge.libtorrent as lt
+except ImportError:
+    import libtorrent as lt
+    if not (libtorrent.version_major == 0 and libtorrent.version_minor == 14):
+        raise ImportError("This version of Deluge requires libtorrent 0.14!")
+
 import deluge.configmanager
 import deluge.common
 import deluge.component as component

deluge/core/torrent.py

@@ -30,9 +30,12 @@ import time
 from urlparse import urlparse
 
 try:
-    import libtorrent as lt
-except ImportError:
     import deluge.libtorrent as lt
+except ImportError:
+    import libtorrent as lt
+    if not (libtorrent.version_major == 0 and libtorrent.version_minor == 14):
+        raise ImportError("This version of Deluge requires libtorrent 0.14!")
+
 import deluge.common
 import deluge.component as component
 from deluge.configmanager import ConfigManager

deluge/core/torrentmanager.py

@@ -34,9 +34,12 @@ import shutil
 import gobject
 
 try:
-    import libtorrent as lt
-except ImportError:
     import deluge.libtorrent as lt
+except ImportError:
+    import libtorrent as lt
+    if not (libtorrent.version_major == 0 and libtorrent.version_minor == 14):
+        raise ImportError("This version of Deluge requires libtorrent 0.14!")
+
 
 import deluge.common
 import deluge.component as component