commit 5019761881c7807ab0f09f0728f337b5ce857ca5 Merge: dfbc8e0 a51f553 Author: Isis Lovecruft isis@torproject.org Date: Thu Jun 25 03:17:58 2015 +0000

Merge branch 'fix/12506-separate-dist-dirs' into develop

doc/sphinx/source/bridgedb.HTTPServer.rst | 8 - doc/sphinx/source/bridgedb.https.rst | 11 + doc/sphinx/source/bridgedb.rst | 2 +- doc/sphinx/source/conf.py | 4 +- lib/bridgedb/Bridges.py | 51 +- lib/bridgedb/Dist.py | 664 ++++++------ lib/bridgedb/Filters.py | 41 +- lib/bridgedb/HTTPServer.py | 935 ----------------- lib/bridgedb/Main.py | 116 +-- lib/bridgedb/bridgerequest.py | 23 +- lib/bridgedb/bridges.py | 123 ++- lib/bridgedb/email/autoresponder.py | 16 +- lib/bridgedb/email/request.py | 15 - lib/bridgedb/email/templates.py | 14 +- lib/bridgedb/https/__init__.py | 1 + lib/bridgedb/https/request.py | 143 +++ lib/bridgedb/https/server.py | 909 +++++++++++++++++ .../https/templates/assets/css/bootstrap.min.css | 7 + lib/bridgedb/https/templates/assets/css/custom.css | 158 +++ .../templates/assets/css/font-awesome-ie7.min.css | 384 +++++++ .../templates/assets/css/font-awesome.min.css | 403 ++++++++ lib/bridgedb/https/templates/assets/css/main.css | 24 + .../templates/assets/font/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 ++++++++ .../templates/assets/font/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 0 -> 43572 bytes .../https/templates/assets/font/lato-bold.woff | Bin 0 -> 46160 bytes .../https/templates/assets/font/lato-italic.woff | Bin 0 -> 47168 bytes .../https/templates/assets/font/lato-regular.woff | Bin 0 -> 46108 bytes .../https/templates/assets/tor-roots-blue.svg | 95 ++ lib/bridgedb/https/templates/assets/tor.svg | 6 + lib/bridgedb/https/templates/base.html | 108 ++ lib/bridgedb/https/templates/bridges.html | 203 ++++ lib/bridgedb/https/templates/captcha.html | 63 ++ lib/bridgedb/https/templates/howto.html | 39 + lib/bridgedb/https/templates/index.html | 43 + lib/bridgedb/https/templates/options.html | 164 +++ lib/bridgedb/https/templates/robots.txt | 1079 ++++++++++++++++++++ lib/bridgedb/strings.py | 270 ++++- lib/bridgedb/templates/assets/bridgedb.png | Bin 2946 -> 0 bytes .../templates/assets/css/bootstrap.min.css | 7 - lib/bridgedb/templates/assets/css/custom.css | 158 --- .../templates/assets/css/font-awesome-ie7.min.css | 384 ------- .../templates/assets/css/font-awesome.min.css | 403 -------- lib/bridgedb/templates/assets/css/main.css | 24 - .../templates/assets/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 -------- .../templates/assets/font/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes lib/bridgedb/templates/assets/font/lato-bold.woff | Bin 46160 -> 0 bytes .../templates/assets/font/lato-italic.woff | Bin 47168 -> 0 bytes .../templates/assets/font/lato-regular.woff | Bin 46108 -> 0 bytes lib/bridgedb/templates/assets/tor-roots-blue.svg | 95 -- lib/bridgedb/templates/assets/tor.svg | 6 - lib/bridgedb/templates/base.html | 108 -- lib/bridgedb/templates/bridgedb.asc | 252 ----- lib/bridgedb/templates/bridges.html | 203 ---- lib/bridgedb/templates/captcha.html | 63 -- lib/bridgedb/templates/howto.html | 39 - lib/bridgedb/templates/index.html | 43 - lib/bridgedb/templates/options.html | 164 --- lib/bridgedb/templates/robots.txt | 1079 -------------------- lib/bridgedb/test/email_helpers.py | 36 +- lib/bridgedb/test/https_helpers.py | 130 +++ lib/bridgedb/test/legacy_Tests.py | 69 +- lib/bridgedb/test/test_Dist.py | 239 +++++ lib/bridgedb/test/test_HTTPServer.py | 804 --------------- lib/bridgedb/test/test_Main.py | 101 +- lib/bridgedb/test/test_bridgerequest.py | 20 +- lib/bridgedb/test/test_bridges.py | 83 +- lib/bridgedb/test/test_email_server.py | 5 +- lib/bridgedb/test/test_https_request.py | 91 ++ lib/bridgedb/test/test_https_server.py | 838 +++++++++++++++ lib/bridgedb/test/test_translations.py | 2 +- lib/bridgedb/test/util.py | 76 ++ setup.py | 5 +- 76 files changed, 6594 insertions(+), 5853 deletions(-)