From c10a83d0aaf72c1604716aa893ed7b210cdd1aa2 Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Tue, 16 Dec 2008 04:36:10 +0000 Subject: [PATCH] Fix libtorrent import in addtorrentdialog --- deluge/ui/gtkui/addtorrentdialog.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/deluge/ui/gtkui/addtorrentdialog.py b/deluge/ui/gtkui/addtorrentdialog.py index 909643f92..5156af24d 100644 --- a/deluge/ui/gtkui/addtorrentdialog.py +++ b/deluge/ui/gtkui/addtorrentdialog.py @@ -31,6 +31,13 @@ import gobject import pkg_resources +try: + import deluge.libtorrent as lt +except ImportError: + import libtorrent as lt + if not (lt.version_major == 0 and lt.version_minor == 14): + raise ImportError("This version of Deluge requires libtorrent 0.14!") + from deluge.ui.client import aclient as client import deluge.component as component import deluge.ui.gtkui.listview as listview @@ -171,10 +178,6 @@ class AddTorrentDialog(component.Component): break def add_from_files(self, filenames): - try: - import libtorrent as lt - except ImportError: - import deluge.libtorrent as lt import os.path new_row = None