commit 4ebb7842a53b513996604b3a8442fc0c5fc0e3fd Merge: 5019761 8d4bb32 Author: Isis Lovecruft isis@torproject.org Date: Thu Jun 25 03:24:18 2015 +0000

Merge branch 'fix/12029-distribute-module' into develop

doc/sphinx/source/bridgedb.Dist.rst | 8 - doc/sphinx/source/bridgedb.Filters.rst | 8 - doc/sphinx/source/bridgedb.email.rst | 1 + doc/sphinx/source/bridgedb.filters.rst | 8 + doc/sphinx/source/bridgedb.https.rst | 1 + doc/sphinx/source/bridgedb.rst | 3 +- doc/sphinx/source/conf.py | 5 +- lib/bridgedb/Bridges.py | 101 +++-- lib/bridgedb/Dist.py | 559 ------------------------- lib/bridgedb/Filters.py | 116 ----- lib/bridgedb/Main.py | 36 +- lib/bridgedb/bridgerequest.py | 77 ++-- lib/bridgedb/bridges.py | 115 +++-- lib/bridgedb/distribute.py | 275 ++++++++++++ lib/bridgedb/email/autoresponder.py | 13 +- lib/bridgedb/email/distributor.py | 219 ++++++++++ lib/bridgedb/email/request.py | 6 +- lib/bridgedb/email/server.py | 4 +- lib/bridgedb/email/templates.py | 2 +- lib/bridgedb/filters.py | 238 +++++++++++ lib/bridgedb/https/distributor.py | 328 +++++++++++++++ lib/bridgedb/https/request.py | 2 +- lib/bridgedb/https/server.py | 6 +- lib/bridgedb/interfaces.py | 56 ++- lib/bridgedb/parse/addr.py | 13 +- lib/bridgedb/persistent.py | 16 +- lib/bridgedb/test/email_helpers.py | 24 +- lib/bridgedb/test/https_helpers.py | 6 +- lib/bridgedb/test/legacy_Tests.py | 301 +------------ lib/bridgedb/test/test_Dist.py | 239 ----------- lib/bridgedb/test/test_Main.py | 6 +- lib/bridgedb/test/test_bridges.py | 10 +- lib/bridgedb/test/test_distribute.py | 44 ++ lib/bridgedb/test/test_email_autoresponder.py | 2 +- lib/bridgedb/test/test_email_distributor.py | 258 ++++++++++++ lib/bridgedb/test/test_email_request.py | 16 +- lib/bridgedb/test/test_email_server.py | 6 +- lib/bridgedb/test/test_filters.py | 333 +++++++++++++++ lib/bridgedb/test/test_https_distributor.py | 405 ++++++++++++++++++ lib/bridgedb/test/test_https_server.py | 2 +- lib/bridgedb/test/test_interfaces.py | 55 +++ lib/bridgedb/test/util.py | 48 ++- lib/bridgedb/util.py | 16 + 43 files changed, 2561 insertions(+), 1426 deletions(-)