Merge branch 'test-cleanup' of https://github.com/whirm/tribler.git into

test-cleanup Conflicts: Tribler/Test/API/test_seeding_live.py
NielsZeilemaker · May 7, 2013 · 440b491 · 440b491
2 parents f0113db + e1ece14
commit 440b491
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/Tribler/Core/Session.py b/Tribler/Core/Session.py
@@ -8,15 +8,11 @@
 import copy
 import binascii
 from traceback import print_exc
-from threading import RLock
 
-from Tribler.__init__ import LIBRARYNAME
 from Tribler.Core.simpledefs import *
 from Tribler.Core.defaults import sessdefaults
 from Tribler.Core.Base import *
 from Tribler.Core.SessionConfig import *
-from Tribler.Core.DownloadConfig import get_default_dest_dir
-from Tribler.Core.Utilities.utilities import find_prog_in_PATH
 from Tribler.Core.APIImplementation.SessionRuntimeConfig import SessionRuntimeConfig
 from Tribler.Core.APIImplementation.LaunchManyCore import TriblerLaunchMany
 from Tribler.Core.APIImplementation.UserCallbackHandler import UserCallbackHandler

diff --git a/Tribler/Test/API/test_seeding_live.py b/Tribler/Test/API/test_seeding_live.py
@@ -8,7 +8,6 @@
 import time
 import socket
 import tempfile
-from traceback import print_exc
 
 from Tribler.Test.test_as_server import TestAsServer
 from Tribler.Test.btconn import BTConnection