From 4fcad3bddf0b71d6d10a4cc0fc7a2b9f204c7435 Mon Sep 17 00:00:00 2001 From: j Date: Fri, 24 Jun 2016 13:18:14 +0200 Subject: [PATCH] tor browser only exists for x86 --- oml/tor.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/oml/tor.py b/oml/tor.py index 200a640..b51a9f3 100644 --- a/oml/tor.py +++ b/oml/tor.py @@ -1,19 +1,20 @@ -import os -import re -import sys -import subprocess -import time from threading import Thread import distutils +import os +import platform +import re +import subprocess +import sys +import time import zipfile +from Crypto.PublicKey import RSA import ox import stem from stem import Signal from stem.control import Controller -from Crypto.PublicKey import RSA -import settings +import settings import state import utils @@ -236,6 +237,11 @@ def torbrowser_url(sys_platform=None): if not sys_platform: sys_platform = sys.platform + if sys_platform.startswith('linux'): + machine = platform.machine() + if machine not in ('x86_64', 'i386', 'i686'): + return + base_url = 'https://dist.torproject.org/torbrowser/' data = read_url(base_url, timeout=3*24*60*60).decode() versions = [] @@ -248,7 +254,6 @@ def torbrowser_url(sys_platform=None): url = base_url + current language = '.*?en' if sys_platform.startswith('linux'): - import platform if platform.architecture()[0] == '64bit': osname = 'linux64' else: