Browse Source

Merge pull request #11049 from Chocobo1/python

Update outdated strings
adaptive-webui-19844
Mike Tzou 5 years ago committed by GitHub
parent
commit
2f32b0962e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/base/net/downloadmanager.cpp
  2. 6
      src/gui/mainwindow.cpp
  3. 4
      src/searchengine/nova/helpers.py
  4. 4
      src/searchengine/nova3/helpers.py

4
src/base/net/downloadmanager.cpp

@ -50,8 +50,8 @@ @@ -50,8 +50,8 @@
#include "base/utils/misc.h"
#include "proxyconfigurationmanager.h"
// Spoof Firefox 38 user agent to avoid web server banning
const char DEFAULT_USER_AGENT[] = "Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Firefox/38.0";
// Disguise as Firefox to avoid web server banning
const char DEFAULT_USER_AGENT[] = "Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0";
namespace
{

6
src/gui/mainwindow.cpp

@ -2003,7 +2003,11 @@ void MainWindow::installPython() @@ -2003,7 +2003,11 @@ void MainWindow::installPython()
{
setCursor(QCursor(Qt::WaitCursor));
// Download python
const QString installerURL = "https://www.python.org/ftp/python/3.6.6/python-3.6.6.exe";
#ifdef QBT_APP_64BIT
const QString installerURL = "https://www.python.org/ftp/python/3.7.4/python-3.7.4-amd64.exe";
#else
const QString installerURL = "https://www.python.org/ftp/python/3.7.4/python-3.7.4.exe";
#endif
Net::DownloadManager::instance()->download(
Net::DownloadRequest(installerURL).saveToFile(true)
, this, &MainWindow::pythonDownloadFinished);

4
src/searchengine/nova/helpers.py

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
#VERSION: 1.43
#VERSION: 1.44
# Author:
# Christophe DUMEZ (chris@qbittorrent.org)
@ -40,7 +40,7 @@ import tempfile @@ -40,7 +40,7 @@ import tempfile
import urllib2
# Some sites blocks default python User-agent
user_agent = 'Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Firefox/38.0'
user_agent = 'Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0'
headers = {'User-Agent': user_agent}
# SOCKS5 Proxy support
if ("sock_proxy" in os.environ) and (len(os.environ["sock_proxy"].strip()) > 0):

4
src/searchengine/nova3/helpers.py

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
#VERSION: 1.42
#VERSION: 1.43
# Author:
# Christophe DUMEZ (chris@qbittorrent.org)
@ -40,7 +40,7 @@ import urllib.parse @@ -40,7 +40,7 @@ import urllib.parse
import urllib.request
# Some sites blocks default python User-agent
user_agent = 'Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Firefox/38.0'
user_agent = 'Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0'
headers = {'User-Agent': user_agent}
# SOCKS5 Proxy support
if "sock_proxy" in os.environ and len(os.environ["sock_proxy"].strip()) > 0:

Loading…
Cancel
Save