Removed six

Author: egbertbouman

.sonar/analyse.py

@@ -10,8 +10,6 @@
 
 import requests
 
-from six.moves import xrange
-
 # These env varialble should be set by Jenkins.
 SERVER_URL = os.environ.get('SONAR_SERVER_URL', "https://sonarcloud.io")
 PROJECT_KEY = os.environ.get('PROJECT_KEY', "org.sonarqube:tribler")
@@ -34,7 +32,7 @@
 
 print("Task status URL: %s" % task_status_url)
 
-for _ in xrange(0, 30):
+for _ in range(0, 30):
     print("Fetching task status...")
     json_response = requests.get(task_status_url)
     data = json.loads(json_response.text)

Tribler/Core/APIImplementation/LaunchManyCore.py

@@ -27,8 +27,6 @@
 
 from ipv8_service import IPv8
 
-from six import text_type
-
 from Tribler.Core.Config.download_config import DownloadConfig
 from Tribler.Core.Modules.MetadataStore.store import MetadataStore
 from Tribler.Core.Modules.gigachannel_manager import GigaChannelManager
@@ -505,7 +503,7 @@ async def sesscb_states_callback(self, states_list):
                         infohash) == self.session.config.get_bootstrap_infohash() and self.trustchain_community:
                     if download.future_flushed.done():
                         with open(self.bootstrap.bootstrap_file, 'r') as f:
-                            sql_dumb = text_type(f.read())
+                            sql_dumb = f.read()
                         self._logger.info("Executing script for trustchain bootstrap")
                         self.trustchain_community.persistence.executescript(sql_dumb)
                         self.trustchain_community.persistence.commit()
@@ -581,7 +579,7 @@ def resume_download(self, filename, setupDelay=0):
             tdef = (TorrentDefNoMetainfo(metainfo[b'infohash'], metainfo[b'name'], url)
                     if b'infohash' in metainfo else TorrentDef.load_from_dict(metainfo))
         except ValueError as e:
-            self._logger.exception("tlm: could not restore tdef from metainfo dict: %s %s ", e, text_type(metainfo))
+            self._logger.exception("tlm: could not restore tdef from metainfo dict: %s %s ", e, metainfo)
             return
 
         if config.get_bootstrap_download():

Tribler/Core/Category/FamilyFilter.py

@@ -7,8 +7,6 @@
 import os
 import re
 
-from six.moves import xrange
-
 from Tribler.Core.Utilities.install_dir import get_lib_path
 
 WORDS_REGEXP = re.compile('[a-zA-Z0-9]+')
@@ -77,7 +75,7 @@ def isXXX(self, s, isFilename=True, nonXXXFormat=False):
         if not self.isAudio(s) and self.foundXXXTerm(s):
             return True
         words = self._getWords(s)
-        words2 = [' '.join(words[i:i + 2]) for i in xrange(0, len(words) - 1)]
+        words2 = [' '.join(words[i:i + 2]) for i in range(0, len(words) - 1)]
         num_xxx = len([w for w in words + words2 if self.isXXXTerm(w, s)])
         if nonXXXFormat or (isFilename and self.isAudio(s)):
             return num_xxx > 2  # almost never classify mp3 as porn

Tribler/Core/Category/init_category.py

@@ -3,7 +3,7 @@
 
 Author(s): Yuan Yuan
 """
-from six.moves import configparser
+import configparser
 
 
 def __split_list(string):

Tribler/Core/Config/download_config.py

@@ -5,8 +5,6 @@
 
 import libtorrent as lt
 
-from six import string_types
-
 from validate import Validator
 
 from Tribler.Core.Utilities.install_dir import get_lib_path
@@ -61,7 +59,7 @@ def set_dest_dir(self, path):
             base_path = self.state_dir
             if base_path == os.path.commonprefix([path, base_path]):
                 path = os.path.relpath(path, base_path)
-        assert isinstance(path, string_types), path
+        assert isinstance(path, str), path
         self.config['download_defaults']['saveas'] = path
 
     def get_dest_dir(self):

Tribler/Core/Config/tribler_config.py

@@ -6,8 +6,6 @@
 
 from configobj import ConfigObj
 
-from six import text_type
-
 from validate import Validator
 
 from Tribler.Core.Config.download_config import get_default_dest_dir
@@ -493,7 +491,7 @@ def set_tunnel_community_socks5_listen_ports(self, ports):
     def get_tunnel_community_socks5_listen_ports(self):
         ports = self.config['tunnel_community']['socks5_listen_ports']
         path = u'tunnel_community~socks5_listen_ports~'
-        return [self._get_random_port(path + text_type(index))
+        return [self._get_random_port(path + str(index))
                 if int(port) < 0 else int(port) for index, port in enumerate(ports)]
 
     def set_tunnel_community_exitnode_enabled(self, value):

Tribler/Core/CreditMining/CreditMiningManager.py

@@ -9,8 +9,6 @@
 
 import psutil
 
-from six import string_types
-
 from Tribler.Core.Config.download_config import DownloadConfig
 from Tribler.Core.CreditMining.CreditMiningPolicy import InvestmentPolicy, MB
 from Tribler.Core.CreditMining.CreditMiningSource import ChannelSource
@@ -156,7 +154,7 @@ def add_source(self, source_str):
         if source_str not in self.sources:
             num_torrents = len(self.torrents)
 
-            if isinstance(source_str, string_types):
+            if isinstance(source_str, str):
                 source = ChannelSource(self.session, unhexlify(source_str), self.on_torrent_insert)
             else:
                 self._logger.error('Cannot add unknown source %s', source_str)

Tribler/Core/CreditMining/CreditMiningPolicy.py

@@ -6,8 +6,6 @@
 import random
 import time
 
-from six.moves import xrange
-
 from Tribler.Core.simpledefs import DLSTATUS_DOWNLOADING, DLSTATUS_SEEDING, DLSTATUS_STOPPED, \
     DLSTATUS_STOPPED_ON_ERROR, DOWNLOAD, UPLOAD
 
@@ -159,7 +157,7 @@ def get_default_investment_states():
         """
         investment = 5
         states = {}
-        for level in xrange(10):
+        for level in range(10):
             download_state = 2 * level
             upload_state = download_state + 1
             states[download_state] = InvestmentState(download_state, download_state % 2, investment * MB)

Tribler/Core/DownloadState.py

@@ -6,7 +6,6 @@
 import logging
 
 from ipv8.messaging.anonymization.tunnel import PEER_FLAG_EXIT_ANY
-from six import ensure_text
 
 from Tribler.Core.simpledefs import (DLSTATUS_ALLOCATING_DISKSPACE, DLSTATUS_CIRCUITS, DLSTATUS_DOWNLOADING,
                                      DLSTATUS_EXIT_NODES, DLSTATUS_HASHCHECKING, DLSTATUS_METADATA, DLSTATUS_SEEDING,
@@ -74,8 +73,7 @@ def get_error(self):
         """ Returns the Exception that caused the download to be moved to DLSTATUS_STOPPED_ON_ERROR status.
         @return An error message
         """
-        return self.error or \
-               (ensure_text(self.lt_status.error) if self.lt_status and self.lt_status.error else None)
+        return self.error or (self.lt_status.error if self.lt_status and self.lt_status.error else None)
 
     def get_current_speed(self, direct):
         """

Tribler/Core/Libtorrent/LibtorrentDownloadImpl.py

@@ -10,13 +10,9 @@
 import sys
 import time
 from asyncio import ensure_future, sleep, Future, CancelledError, iscoroutine
-from threading import RLock
-
-from six import ensure_binary, ensure_text
 
 import libtorrent as lt
 
-from six import int2byte, text_type
 
 from Tribler.Core.Config.download_config import DownloadConfig, get_default_dest_dir
 from Tribler.Core.DownloadState import DownloadState
@@ -30,6 +26,7 @@
 from Tribler.Core.osutils import fix_filebasename
 from Tribler.Core.simpledefs import DLMODE_VOD, DLSTATUS_SEEDING, DLSTATUS_STOPPED
 from Tribler.pyipv8.ipv8.taskmanager import TaskManager
+from Tribler.pyipv8.ipv8.util import int2byte
 
 if sys.platform == "win32":
     try:
@@ -234,7 +231,7 @@ async def create_handle(self, checkpoint_disabled=False, share_mode=False, uploa
             metainfo = self.tdef.get_metainfo()
             torrentinfo = lt.torrent_info(metainfo)
 
-            self.orig_files = [ensure_text(file_entry.path) for file_entry in torrentinfo.files()]
+            self.orig_files = [file_entry.path for file_entry in torrentinfo.files()]
             is_multifile = len(self.orig_files) > 1
             commonprefix = os.path.commonprefix(self.orig_files) if is_multifile else ''
             swarmname = commonprefix.partition(os.path.sep)[0]
@@ -254,8 +251,8 @@ async def create_handle(self, checkpoint_disabled=False, share_mode=False, uploa
             if resume_data and isinstance(resume_data, dict):
                 # Rewrite save_path as a global path, if it is given as a relative path
                 if b"save_path" in resume_data and not os.path.isabs(resume_data[b"save_path"]):
-                    resume_data[b"save_path"] = text_type(
-                        os.path.join(self.state_dir, ensure_unicode(resume_data[b"save_path"], 'utf-8')))
+                    resume_data[b"save_path"] = os.path.join(self.state_dir,
+                                                             ensure_unicode(resume_data[b"save_path"], 'utf-8'))
                 atp["resume_data"] = lt.bencode(resume_data)
         else:
             atp["url"] = self.tdef.get_url() or "magnet:?xt=urn:btih:" + hexlify(self.tdef.get_infohash())
@@ -469,8 +466,8 @@ def on_save_resume_data_alert(self, alert):
         if self.state_dir and b'save_path' in resume_data and os.path.abspath(resume_data[b'save_path']):
             if self.state_dir == os.path.commonprefix([ensure_unicode(resume_data[b'save_path'], 'utf-8'),
                                                        self.state_dir]):
-                resume_data[b'save_path'] = text_type(
-                    os.path.relpath(ensure_unicode(resume_data[b'save_path'], 'utf-8'), self.state_dir))
+                resume_data[b'save_path'] = os.path.relpath(ensure_unicode(resume_data[b'save_path'], 'utf-8'),
+                                                            self.state_dir)
 
         metainfo = {
             'infohash': self.tdef.get_infohash(),
@@ -534,7 +531,7 @@ def on_metadata_received_alert(self, alert):
 
         metadata = {b'info': lt.bdecode(torrent_info.metadata())}
 
-        trackers = [ensure_binary(tracker['url']) for tracker in self.handle.trackers()]
+        trackers = [tracker['url'].encode('utf-8') for tracker in self.handle.trackers()]
         if trackers:
             if len(trackers) > 1:
                 metadata[b"announce-list"] = [trackers]
@@ -553,7 +550,7 @@ def on_metadata_received_alert(self, alert):
             self._logger.warning("Torrent contains no files!")
             torrent_files = []
 
-        self.orig_files = [ensure_text(torrent_file.path) for torrent_file in torrent_files]
+        self.orig_files = [torrent_file.path for torrent_file in torrent_files]
         self.set_corrected_infoname()
         self.set_filepieceranges()
         self.set_selected_files()
@@ -695,9 +692,9 @@ def set_selected_files(self, selected_files=None):
 
                 # as from libtorrent 1.0, files returning file_storage (lazy-iterable)
                 if hasattr(lt, 'file_storage') and isinstance(torrent_storage, lt.file_storage):
-                    cur_path = ensure_text(torrent_storage.at(index).path)
+                    cur_path = torrent_storage.at(index).path
                 else:
-                    cur_path = ensure_text(torrent_storage[index].path)
+                    cur_path = torrent_storage[index].path
 
                 if cur_path != new_path:
                     if not os.path.exists(unwanteddir_abs) and self.unwanted_directory_name in new_path:
@@ -736,7 +733,7 @@ def get_save_path(self):
             # self.handle.status().save_path to query the save path of a torrent. However, this attribute
             # is only included in libtorrent 1.0.9+
             status = self.handle.status()
-            return ensure_text(status.save_path if hasattr(status, 'save_path') else self.handle.save_path())
+            return status.save_path if hasattr(status, 'save_path') else self.handle.save_path()
 
     @checkHandle()
     def force_recheck(self):
@@ -871,7 +868,7 @@ def get_tracker_status(self):
         for announce_entry in self.handle.trackers():
             if announce_entry['url'] not in self.tracker_status:
                 try:
-                    url = ensure_text(announce_entry['url'])
+                    url = announce_entry['url']
                     self.tracker_status[url] = [0, 'Not contacted yet']
                 except UnicodeDecodeError:
                     pass
@@ -967,7 +964,7 @@ def get_dest_files(self, exts=None):
                 filename = file_entry.path
                 ext = os.path.splitext(filename)[1].lstrip('.')
                 if exts is None or ext in exts:
-                    dest_files.append((filename, os.path.join(self.config.get_dest_dir(), ensure_text(filename))))
+                    dest_files.append((filename, os.path.join(self.config.get_dest_dir(), filename)))
         return dest_files
 
     def checkpoint(self):

Tribler/Core/Libtorrent/LibtorrentMgr.py

@@ -12,15 +12,13 @@
 from binascii import unhexlify
 from distutils.version import LooseVersion
 from shutil import rmtree
+from urllib.request import url2pathname
 
 from ipv8.taskmanager import TaskManager
 
 import libtorrent as lt
 from libtorrent import bdecode, torrent_handle
 
-from six import text_type
-from six.moves.urllib.request import url2pathname
-
 from Tribler.Core.Config.download_config import DownloadConfig
 from Tribler.Core.Modules.dht_health_manager import DHTHealthManager
 from Tribler.Core.TorrentDef import TorrentDef, TorrentDefNoMetainfo
@@ -696,6 +694,6 @@ def post_session_stats(self, hops=None):
 
 def encode_atp(atp):
     for k, v in atp.items():
-        if isinstance(v, text_type):
+        if isinstance(v, str):
             atp[k] = v.encode('utf-8')
     return atp

Tribler/Core/Modules/MetadataStore/OrmBindings/torrent_metadata.py

@@ -6,8 +6,6 @@
 from pony import orm
 from pony.orm import db_session
 
-from six import text_type
-
 from Tribler.Core.Category.Category import default_category_filter
 from Tribler.Core.Category.FamilyFilter import default_xxx_filter
 from Tribler.Core.Modules.MetadataStore.OrmBindings.channel_node import COMMITTED, LEGACY_ENTRY
@@ -157,7 +155,7 @@ def metadata_conflicting(self, b):
             # WARNING! This does NOT check the INFOHASH
             a = self.to_dict()
             for comp in ["title", "size", "tags", "torrent_date", "tracker_info"]:
-                if (comp not in b) or (text_type(a[comp]) == text_type(b[comp])):
+                if (comp not in b) or (str(a[comp]) == str(b[comp])):
                     continue
                 return True
             return False

Tribler/Core/Modules/process_checker.py

@@ -2,8 +2,6 @@
 
 import psutil
 
-from six import text_type
-
 from Tribler.Core.Config.tribler_config import TriblerConfig
 
 
@@ -64,7 +62,7 @@ def create_lock_file(self):
         self.remove_lock_file()
 
         with open(self.lock_file_path, 'wb') as lock_file:
-            lock_file.write(text_type(os.getpid()).encode())
+            lock_file.write(str(os.getpid()).encode())
 
     def remove_lock_file(self):
         """

Tribler/Core/Modules/restapi/debug_endpoint.py

@@ -2,13 +2,12 @@
 import logging
 import os
 import sys
+from io import StringIO
 
 from aiohttp import web
 
 import psutil
 
-from six import StringIO
-
 from Tribler.Core.Utilities.instrumentation import WatchDog
 from Tribler.Core.Modules.restapi.rest_endpoint import RESTEndpoint, RESTResponse
 

Tribler/Core/Modules/restapi/downloads_endpoint.py

@@ -1,16 +1,14 @@
 import json
 import os
 from binascii import unhexlify
+from urllib.parse import unquote_plus
+from urllib.request import url2pathname
 
 from aiohttp import web
 from libtorrent import bencode, create_torrent
 
 from pony.orm import db_session
 
-from six import unichr  # pylint: disable=redefined-builtin
-from six.moves.urllib.parse import unquote_plus
-from six.moves.urllib.request import url2pathname
-
 from Tribler.Core.Config.download_config import DownloadConfig
 from Tribler.Core.Modules.MetadataStore.serialization import CHANNEL_TORRENT
 from Tribler.Core.Modules.MetadataStore.store import UNKNOWN_CHANNEL, UPDATED_OUR_VERSION
@@ -41,7 +39,7 @@ def _safe_extended_peer_info(ext_peer_info):
         return ext_peer_info
     except UnicodeDecodeError:
         # We might have some special unicode characters in here
-        return u''.join([unichr(ord(c)) for c in ext_peer_info])
+        return u''.join([chr(ord(c)) for c in ext_peer_info])
 
 
 class DownloadsEndpoint(RESTEndpoint):

Tribler/Core/Modules/restapi/shutdown_endpoint.py

@@ -42,15 +42,16 @@ async def shutdown(self, request):
 
         async def shutdown():
             try:
-                await self.session.shutdown()
+                keep_loop_running = await self.session.shutdown()
             except Exception as e:
                 self._logger.error(e)
 
             self.process_checker.remove_lock_file()
             # Flush the logs to the file before exiting
             for handler in logging.getLogger().handlers:
                 handler.flush()
-            get_event_loop().stop()
+            if not keep_loop_running:
+                get_event_loop().stop()
 
         ensure_future(shutdown())
         return RESTResponse({"shutdown": True})