Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-27 23:07:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into receiver-mode-gui

Browse Source
This commit is contained in:
Micah Lee 2018-09-17 16:15:08 -07:00
commit 6efc281fbb
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
install/requirements-windows.txt
View File

@ -1,18 +1,26 @@
altgraph==0.16.1
certifi==2018.8.24
chardet==3.0.4
click==6.7 click==6.7
cryptography==2.3.1 Flask==1.0.2
Flask==0.12.2
future==0.16.0 future==0.16.0
idna==2.7
itsdangerous==0.24 itsdangerous==0.24
Jinja2==2.10 Jinja2==2.10
macholib==1.11
MarkupSafe==1.0 MarkupSafe==1.0
pefile==2017.11.5 packaging==17.1
PyInstaller==3.3.1 pefile==2018.8.8
PyQt5==5.9.2 PyInstaller==3.4
PySocks==1.6.7 pyparsing==2.2.0
pynacl==1.2.1 pypiwin32==223
pycrypto==2.6.1 PyQt5==5.11.2
pysha3==1.0.2 PySocks==1.6.8
python-dateutil==2.7.3
pywin32==223
requests==2.19.1 requests==2.19.1
sip==4.19.6 sip==4.19.8
six==1.11.0
stem==1.6.0 stem==1.6.0
urllib3==1.23
Werkzeug==0.14.1 Werkzeug==0.14.1

23
install/requirements.txt
View File

@ -1,16 +1,21 @@
altgraph==0.16.1
certifi==2018.8.24
chardet==3.0.4
click==6.7 click==6.7
cryptography==2.3.1 Flask==1.0.2
Flask==0.12.2 future==0.16.0
idna==2.7
itsdangerous==0.24 itsdangerous==0.24
Jinja2==2.10 Jinja2==2.10
macholib==1.11
MarkupSafe==1.0 MarkupSafe==1.0
PyInstaller==3.3.1 pefile==2018.8.8
PyQt5==5.9.2 PyInstaller==3.4
PySocks==1.6.7 PyQt5==5.11.2
pycrypto==2.6.1 PyQt5-sip==4.19.12
pynacl==1.2.1 PySocks==1.6.8
pysha3==1.0.2
requests==2.19.1 requests==2.19.1
sip==4.19.6 sip==4.19.8
stem==1.6.0 stem==1.6.0
urllib3==1.23
Werkzeug==0.14.1 Werkzeug==0.14.1

10
onionshare/web.py
View File

@ -33,6 +33,7 @@ from distutils.version import LooseVersion as Version
from urllib.request import urlopen from urllib.request import urlopen
from datetime import datetime from datetime import datetime
import flask
from flask import ( from flask import (
Flask, Response, Request, request, render_template, abort, make_response, Flask, Response, Request, request, render_template, abort, make_response,
flash, redirect, __version__ as flask_version flash, redirect, __version__ as flask_version
@ -42,6 +43,15 @@ from werkzeug.utils import secure_filename
from . import strings from . import strings
from .common import DownloadsDirErrorCannotCreate, DownloadsDirErrorNotWritable from .common import DownloadsDirErrorCannotCreate, DownloadsDirErrorNotWritable
# Stub out flask's show_server_banner function, to avoiding showing warnings that
# are not applicable to OnionShare
def stubbed_show_server_banner(env, debug, app_import_path, eager_loading):
pass
flask.cli.show_server_banner = stubbed_show_server_banner
class Web(object): class Web(object):
""" """
The Web object is the OnionShare web server, powered by flask The Web object is the OnionShare web server, powered by flask