- Applied svnmove.sh and imports.sed

git-svn-id: https://svn.tribler.org/abc/branches/arno/d07-11-16-newmain-from-fastgui-r6141@6143 001aeff7-3401-0410-a489-f7902fc005dd

Tribler/Category/Category.py

@@ -3,9 +3,9 @@
 
 import os
 from Tribler.Category.init_category import getCategoryInfo
-from BitTornado import bencode
-from Tribler.unicode import str2unicode, dunno2unicode
-from Tribler.CacheDB.CacheDBHandler import TorrentDBHandler
+from Tribler.Core.BitTornado import bencode
+from Tribler.Core.Utilities.unicode import str2unicode, dunno2unicode
+from Tribler.Core.CacheDB.CacheDBHandler import TorrentDBHandler
 from sets import Set
 from time import time
 from copy import deepcopy

triblerAPI.py → Tribler/Core/API.py

@@ -308,22 +308,22 @@ class objects requires special measures because of their dual nature. First,
 from traceback import print_exc,print_stack
 from types import StringType,ListType,IntType
 
-from BitTornado.bencode import bencode,bdecode
-from BitTornado.RawServer import autodetect_socket_style
-
-from Tribler.API.simpledefs import *
-from Tribler.API.defaults import *
-from Tribler.API.exceptions import *
-import Tribler.Overlay.permid
-from Tribler.API.Impl.LaunchManyCore import TriblerLaunchMany
-from Tribler.API.Impl.UserCallbackHandler import UserCallbackHandler
-import Tribler.API.Impl.maketorrent as maketorrent
-from Tribler.API.Impl.miscutils import *
-from Tribler.utilities import find_prog_in_PATH,validTorrentFile,isValidURL
-from Tribler.unicode import metainfoname2unicode
-from Tribler.API.osutils import *
-from Tribler.API.Impl.miscutils import *
-from Tribler.CacheDB.Notifier import Notifier
+from Tribler.Core.BitTornado.bencode import bencode,bdecode
+from Tribler.Core.BitTornado.RawServer import autodetect_socket_style
+
+from Tribler.Core.simpledefs import *
+from Tribler.Core.defaults import *
+from Tribler.Core.exceptions import *
+import Tribler.Core.Overlay.permid
+from Tribler.Core.APIImplementation.LaunchManyCore import TriblerLaunchMany
+from Tribler.Core.APIImplementation.UserCallbackHandler import UserCallbackHandler
+import Tribler.Core.APIImplementation.maketorrent as maketorrent
+from Tribler.Core.APIImplementation.miscutils import *
+from Tribler.Core.Utilities.utilities import find_prog_in_PATH,validTorrentFile,isValidURL
+from Tribler.Core.Utilities.unicode import metainfoname2unicode
+from Tribler.Core.osutils import *
+from Tribler.Core.APIImplementation.miscutils import *
+from Tribler.Core.CacheDB.Notifier import Notifier
 
 DEBUG = True
 
@@ -1002,7 +1002,7 @@ def copy(self):
 
 
 # Import here to prevent circular dependencies problem
-from Tribler.API.Impl.SessionRuntimeConfig import SessionRuntimeConfig
+from Tribler.Core.APIImplementation.SessionRuntimeConfig import SessionRuntimeConfig
 
 class Session(SessionRuntimeConfig):
  """
@@ -2428,8 +2428,8 @@ def get_log_messages(self):
 
 
 # Import here to prevent circular dependencies problem
-from Tribler.API.Impl.DownloadRuntimeConfig import DownloadRuntimeConfig
-from Tribler.API.Impl.DownloadImpl import DownloadImpl
+from Tribler.Core.APIImplementation.DownloadRuntimeConfig import DownloadRuntimeConfig
+from Tribler.Core.APIImplementation.DownloadImpl import DownloadImpl
 
 
 class Download(DownloadRuntimeConfig,DownloadImpl):

Tribler/API/Impl/DownloadImpl.py → Tribler/Core/APIImplementation/DownloadImpl.py

@@ -8,11 +8,11 @@
 from threading import currentThread
 from traceback import print_exc,print_stack
 
-import triblerAPI
-from Tribler.API.simpledefs import *
-from Tribler.API.osutils import *
-from Tribler.API.Impl.LaunchManyCore import SingleDownload
-from Tribler.unicode import metainfoname2unicode
+import Tribler.Core.API
+from Tribler.Core.simpledefs import *
+from Tribler.Core.osutils import *
+from Tribler.Core.APIImplementation.LaunchManyCore import SingleDownload
+from Tribler.Core.Utilities.unicode import metainfoname2unicode
 
 
 DEBUG = True

Tribler/API/Impl/DownloadRuntimeConfig.py → Tribler/Core/APIImplementation/DownloadRuntimeConfig.py

@@ -1,7 +1,7 @@
 # Written by Arno Bakker 
 # see LICENSE.txt for license information
 
-import triblerAPI
+import Tribler.Core.API
 
 class DownloadRuntimeConfig(triblerAPI.DownloadConfigInterface):
 

Tribler/API/Impl/LaunchManyCore.py → Tribler/Core/APIImplementation/LaunchManyCore.py

@@ -15,36 +15,36 @@
 from traceback import print_exc,print_stack
 from types import StringType
 
-from BitTornado.__init__ import createPeerID
-from BitTornado.bencode import bencode,bdecode
-from BitTornado.download_bt1 import BT1Download
-from BitTornado.RawServer import RawServer
-from BitTornado.ServerPortHandler import MultiHandler
-from BitTornado.RateLimiter import RateLimiter
-from BitTornado.BT1.track import Tracker
-from BitTornado.HTTPHandler import HTTPHandler,DummyHTTPHandler
-
-import triblerAPI
-from Tribler.API.simpledefs import *
-from Tribler.API.exceptions import *
-from Tribler.NATFirewall.guessip import get_my_wan_ip
-from Tribler.NATFirewall.UPnPThread import UPnPThread
-from Tribler.Overlay.SecureOverlay import SecureOverlay
-from Tribler.Overlay.OverlayApps import OverlayApps
-from Tribler.NATFirewall.DialbackMsgHandler import DialbackMsgHandler
-from Tribler.DecentralizedTracking import mainlineDHT
-from Tribler.DecentralizedTracking.rsconvert import RawServerConverter
+from Tribler.Core.BitTornado.__init__ import createPeerID
+from Tribler.Core.BitTornado.bencode import bencode,bdecode
+from Tribler.Core.BitTornado.download_bt1 import BT1Download
+from Tribler.Core.BitTornado.RawServer import RawServer
+from Tribler.Core.BitTornado.ServerPortHandler import MultiHandler
+from Tribler.Core.BitTornado.RateLimiter import RateLimiter
+from Tribler.Core.BitTornado.BT1.track import Tracker
+from Tribler.Core.BitTornado.HTTPHandler import HTTPHandler,DummyHTTPHandler
+
+import Tribler.Core.API
+from Tribler.Core.simpledefs import *
+from Tribler.Core.exceptions import *
+from Tribler.Core.NATFirewall.guessip import get_my_wan_ip
+from Tribler.Core.NATFirewall.UPnPThread import UPnPThread
+from Tribler.Core.Overlay.SecureOverlay import SecureOverlay
+from Tribler.Core.Overlay.OverlayApps import OverlayApps
+from Tribler.Core.NATFirewall.DialbackMsgHandler import DialbackMsgHandler
+from Tribler.Core.DecentralizedTracking import mainlineDHT
+from Tribler.Core.DecentralizedTracking.rsconvert import RawServerConverter
 from Tribler.Video.utils import win32_retrieve_video_play_command
 from Tribler.Video.utils import win32_retrieve_video_play_command
 
 
-from Tribler.CacheDB.CacheDBHandler import *
-import Tribler.CacheDB.cachedb as cachedb
-from Tribler.utilities import show_permid_short
-from Tribler.API.RequestPolicy import *
+from Tribler.Core.CacheDB.CacheDBHandler import *
+import Tribler.Core.CacheDB.cachedb as cachedb
+from Tribler.Core.Utilities.utilities import show_permid_short
+from Tribler.Core.RequestPolicy import *
 from Tribler.TrackerChecking.TorrentChecking import TorrentChecking
 # TEMP
-from Tribler.Dialogs.activities import *
+from Tribler.Main.Dialogs.activities import *
 
 SPECIAL_VALUE=481
 

Tribler/API/Impl/SessionRuntimeConfig.py → Tribler/Core/APIImplementation/SessionRuntimeConfig.py

@@ -1,7 +1,7 @@
 # Written by Arno Bakker 
 # see LICENSE.txt for license information
 
-import triblerAPI
+import Tribler.Core.API
 
 class SessionRuntimeConfig(triblerAPI.SessionConfigInterface):
 

Tribler/API/Impl/UserCallbackHandler.py → Tribler/Core/APIImplementation/UserCallbackHandler.py

@@ -6,8 +6,8 @@
 import shutil
 from threading import Thread,currentThread
 from traceback import print_exc,print_stack
-from Tribler.API.ThreadPool import ThreadPool
-from Tribler.CacheDB.Notifier import Notifier
+from Tribler.Core.ThreadPool import ThreadPool
+from Tribler.Core.CacheDB.Notifier import Notifier
 
 DEBUG = True
 

Tribler/API/Impl/maketorrent.py → Tribler/Core/APIImplementation/maketorrent.py

@@ -15,14 +15,14 @@
 from traceback import print_exc
 from types import LongType
 
-from BitTornado.bencode import bencode
-from BitTornado.BT1.btformats import check_info
-from Tribler.Merkle.merkle import MerkleTree
-from Tribler.Overlay.permid import create_torrent_signature
-from Tribler.unicode import str2unicode
-from Tribler.API.Impl.miscutils import parse_playtime_to_secs
-
-from Tribler.API.defaults import tdefdictdefaults
+from Tribler.Core.BitTornado.bencode import bencode
+from Tribler.Core.BitTornado.BT1.btformats import check_info
+from Tribler.Core.Merkle.merkle import MerkleTree
+from Tribler.Core.Overlay.permid import create_torrent_signature
+from Tribler.Core.Utilities.unicode import str2unicode
+from Tribler.Core.APIImplementation.miscutils import parse_playtime_to_secs
+
+from Tribler.Core.defaults import tdefdictdefaults
 
 ignore = [] # Arno: was ['core', 'CVS']
 

BitTornado/BT1/Choker.py → Tribler/Core/BitTornado/BT1/Choker.py

@@ -2,7 +2,7 @@
 # see LICENSE.txt for license information
 
 from random import randrange, shuffle
-from BitTornado.clock import clock
+from Tribler.Core.BitTornado.clock import clock
 from traceback import print_stack
 
 try:

BitTornado/BT1/Connecter.py → Tribler/Core/BitTornado/BT1/Connecter.py

@@ -8,23 +8,23 @@
 from random import shuffle
 from traceback import print_exc
 
-from BitTornado.bitfield import Bitfield
-from BitTornado.clock import clock
-from BitTornado.bencode import bencode,bdecode
-from BitTornado.__init__ import version_short,decodePeerID,TRIBLER_PEERID_LETTER
-from BitTornado.BT1.convert import tobinary,toint
+from Tribler.Core.BitTornado.bitfield import Bitfield
+from Tribler.Core.BitTornado.clock import clock
+from Tribler.Core.BitTornado.bencode import bencode,bdecode
+from Tribler.Core.BitTornado.__init__ import version_short,decodePeerID,TRIBLER_PEERID_LETTER
+from Tribler.Core.BitTornado.BT1.convert import tobinary,toint
 
 from MessageID import *
 
 # 2fastbt_
-from Tribler.CacheDB.CacheDBHandler import PeerDBHandler, BarterCastDBHandler
-from Tribler.Overlay.SecureOverlay import SecureOverlay
-from Tribler.DecentralizedTracking.ut_pex import *
+from Tribler.Core.CacheDB.CacheDBHandler import PeerDBHandler, BarterCastDBHandler
+from Tribler.Core.Overlay.SecureOverlay import SecureOverlay
+from Tribler.Core.DecentralizedTracking.ut_pex import *
 # _2fastbt
 
-from Tribler.Overlay.permid import permid_for_user
+from Tribler.Core.Overlay.permid import permid_for_user
 
-from BitTornado.CurrentRateMeasure import Measure
+from Tribler.Core.BitTornado.CurrentRateMeasure import Measure
 
 try:
  True

BitTornado/BT1/Downloader.py → Tribler/Core/BitTornado/BT1/Downloader.py

@@ -1,12 +1,12 @@
 # Written by Bram Cohen and Pawel Garbacki
 # see LICENSE.txt for license information
 
-from BitTornado.CurrentRateMeasure import Measure
-from BitTornado.bitfield import Bitfield
+from Tribler.Core.BitTornado.CurrentRateMeasure import Measure
+from Tribler.Core.BitTornado.bitfield import Bitfield
 from random import shuffle
-from BitTornado.clock import clock
+from Tribler.Core.BitTornado.clock import clock
 # 2fastbt_
-from Tribler.toofastbt.Helper import SingleDownloadHelperInterface
+from Tribler.Core.CoopDownload.Helper import SingleDownloadHelperInterface
 from traceback import print_stack
 # _2fastbt
 

BitTornado/BT1/Encrypter.py → Tribler/Core/BitTornado/BT1/Encrypter.py

@@ -14,9 +14,9 @@
 # 2fastbt_
 from traceback import print_exc, extract_stack, print_stack
 import sys
-from Tribler.Overlay.SecureOverlay import SecureOverlay
-from BitTornado.BT1.MessageID import protocol_name,option_pattern,disabled_overlay_option_pattern
-from BitTornado.BT1.convert import toint
+from Tribler.Core.Overlay.SecureOverlay import SecureOverlay
+from Tribler.Core.BitTornado.BT1.MessageID import protocol_name,option_pattern,disabled_overlay_option_pattern
+from Tribler.Core.BitTornado.BT1.convert import toint
 # _2fastbt
 
 try:

BitTornado/BT1/HTTPDownloader.py → Tribler/Core/BitTornado/BT1/HTTPDownloader.py

@@ -1,15 +1,15 @@
 # Written by John Hoffman
 # see LICENSE.txt for license information
 
-from BitTornado.CurrentRateMeasure import Measure
+from Tribler.Core.BitTornado.CurrentRateMeasure import Measure
 from random import randint
 from urlparse import urlparse
 from httplib import HTTPConnection
 from urllib import quote
 from threading import Thread
-from BitTornado.__init__ import product_name,version_short
+from Tribler.Core.BitTornado.__init__ import product_name,version_short
 # 2fastbt_
-from Tribler.toofastbt.Helper import SingleDownloadHelperInterface
+from Tribler.Core.CoopDownload.Helper import SingleDownloadHelperInterface
 # _2fastbt
 
 try:

BitTornado/BT1/PiecePicker.py → Tribler/Core/BitTornado/BT1/PiecePicker.py

@@ -2,7 +2,7 @@
 # see LICENSE.txt for license information
 
 from random import randrange, shuffle
-from BitTornado.clock import clock
+from Tribler.Core.BitTornado.clock import clock
 # 2fastbt_
 from traceback import extract_tb,print_stack
 import sys

BitTornado/BT1/Rerequester.py → Tribler/Core/BitTornado/BT1/Rerequester.py

@@ -4,10 +4,10 @@
 # see LICENSE.txt for license information
 
 import sys
-from BitTornado.zurllib import urlopen
+from Tribler.Core.BitTornado.zurllib import urlopen
 from urllib import quote
 from btformats import check_peers
-from BitTornado.bencode import bdecode
+from Tribler.Core.BitTornado.bencode import bdecode
 from threading import Thread, Lock, currentThread
 from cStringIO import StringIO
 from traceback import print_exc,print_stack
@@ -17,8 +17,8 @@
 from time import time
 from struct import pack, unpack
 
-from Tribler.NATFirewall.DialbackMsgHandler import DialbackMsgHandler
-import Tribler.DecentralizedTracking.mainlineDHT as mainlineDHT
+from Tribler.Core.NATFirewall.DialbackMsgHandler import DialbackMsgHandler
+import Tribler.Core.DecentralizedTracking.mainlineDHT as mainlineDHT
 
 try:
  from os import getpid

BitTornado/BT1/Storage.py → Tribler/Core/BitTornado/BT1/Storage.py

@@ -1,7 +1,7 @@
 # Written by Bram Cohen
 # see LICENSE.txt for license information
 
-from BitTornado.piecebuffer import BufferPool
+from Tribler.Core.BitTornado.piecebuffer import BufferPool
 from threading import Lock
 from time import strftime, localtime
 import os

BitTornado/BT1/StorageWrapper.py → Tribler/Core/BitTornado/BT1/StorageWrapper.py

@@ -1,18 +1,18 @@
 # Written by Bram Cohen
 # see LICENSE.txt for license information
 
-from BitTornado.bitfield import Bitfield
+from Tribler.Core.BitTornado.bitfield import Bitfield
 from sha import sha
-from BitTornado.clock import clock
+from Tribler.Core.BitTornado.clock import clock
 from traceback import print_exc
 from random import randrange
 from math import log,pow,floor
-from BitTornado.bencode import bencode
+from Tribler.Core.BitTornado.bencode import bencode
 from copy import deepcopy
 import pickle
 import traceback, sys
 
-from Tribler.Merkle.merkle import MerkleTree
+from Tribler.Core.Merkle.merkle import MerkleTree
 
 try:
  True

BitTornado/BT1/Uploader.py → Tribler/Core/BitTornado/BT1/Uploader.py

@@ -1,7 +1,7 @@
 # Written by Bram Cohen
 # see LICENSE.txt for license information
 
-from BitTornado.CurrentRateMeasure import Measure
+from Tribler.Core.BitTornado.CurrentRateMeasure import Measure
 
 import sys