[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed

2014-03-25 Thread translation
commit 32f49b90b7859d22fd95160eb30072ee75a2b286 Author: Translation commit bot Date: Wed Mar 26 06:45:12 2014 + Update translations for torcheck_completed --- id/torcheck.po | 52 +++- 1 file changed, 47 insertions(+), 5 deletions(-) d

[tor-commits] [translation/torcheck] Update translations for torcheck

2014-03-25 Thread translation
commit 3e098c5227ef870374af72e169e6b5f8dd2b596c Author: Translation commit bot Date: Wed Mar 26 06:45:09 2014 + Update translations for torcheck --- id/torcheck.po | 26 +++--- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/id/torcheck.po b/id/tor

[tor-commits] [bridgedb/master] Update translations.

2014-03-25 Thread isis
commit 43b069d31f32e2596bc4ce014f8b8fb214714059 Author: Isis Lovecruft Date: Wed Mar 26 05:27:58 2014 + Update translations. --- lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po| 102 ++ lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po| 104 +++

[tor-commits] [bridgedb/master] Update CHANGELOG with additional changes for 0.1.6.

2014-03-25 Thread isis
commit 24dc8dc82033cbd8ee14d1c06db1e2a3fbcfdbd6 Author: Isis Lovecruft Date: Wed Mar 26 05:42:51 2014 + Update CHANGELOG with additional changes for 0.1.6. --- CHANGELOG |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index bf895ad..09

[tor-commits] [bridgedb/master] Merge branch 'release-0.1.6'

2014-03-25 Thread isis
commit f266f32c365eb7a16cf156cc02f7e492266a7b51 Merge: 783babc 24dc8dc Author: Isis Lovecruft Date: Wed Mar 26 05:46:11 2014 + Merge branch 'release-0.1.6' .travis.yml |8 +- CHANGELOG | 13 + Makefile

[tor-commits] [bridgedb/master] Merge branch 'hotfix/11218-async-render' into develop

2014-03-25 Thread isis
commit 9eca0869ffe25057f0e23bf39115945e70b2e68b Merge: 80a1331 a3bb0ec Author: Isis Lovecruft Date: Wed Mar 26 05:10:08 2014 + Merge branch 'hotfix/11218-async-render' into develop Makefile |4 +- lib/bridgedb/HTTPServer.py | 157

[tor-commits] [bridgedb/master] Add ReCaptchaProtectedResource._renderDeferred() to render deferred resources.

2014-03-25 Thread isis
commit db8eef49536f0c18891bdf1f5151733e07ffc8d3 Author: Isis Lovecruft Date: Tue Mar 25 22:28:45 2014 + Add ReCaptchaProtectedResource._renderDeferred() to render deferred resources. --- lib/bridgedb/HTTPServer.py | 33 + 1 file changed, 33 insertions

[tor-commits] [bridgedb/master] Add a mocked DummyBridge class to test_HTTPServer.py.

2014-03-25 Thread isis
commit f0ca59c8d1792d2fcbea54b0eb29feb10ecacdb0 Author: Isis Lovecruft Date: Wed Mar 19 17:46:32 2014 + Add a mocked DummyBridge class to test_HTTPServer.py. This is used to test that bridges are actually returned on 'bridges.html' results pages, and is missing all of the r

[tor-commits] [bridgedb/master] Add coverage pragma lines to blanket excepts in HTTPServer.

2014-03-25 Thread isis
commit 4eb7ef398e2e2c28f19031fca6595c679c613fe9 Author: Isis Lovecruft Date: Wed Mar 26 04:56:31 2014 + Add coverage pragma lines to blanket excepts in HTTPServer. They are gross, but we have to have these general excepts everywhere, otherwise users could be shown a traceba

[tor-commits] [bridgedb/master] Merge branch 'fix/11196-use-leekspin_r1' into develop

2014-03-25 Thread isis
commit 715ab6a93636f7616036adcd72cf168ede752b42 Merge: 97e261d c9ba8cf Author: Isis Lovecruft Date: Tue Mar 25 02:28:31 2014 + Merge branch 'fix/11196-use-leekspin_r1' into develop .travis.yml|7 +- lib/bridgedb/runner.py |2 +- lib/bridgedb

[tor-commits] [bridgedb/master] Add --rcfile option to additional coverage lines in Makefile.

2014-03-25 Thread isis
commit eabc57bdb24dec6d4693463a7029b1106bf71778 Author: Isis Lovecruft Date: Wed Mar 26 04:59:13 2014 + Add --rcfile option to additional coverage lines in Makefile. --- Makefile |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index edfc69

[tor-commits] [bridgedb/master] Add unittests for _renderDeferred().

2014-03-25 Thread isis
commit 3fe40199972595895c05d8760dade246e8134fe4 Author: Isis Lovecruft Date: Wed Mar 26 05:01:04 2014 + Add unittests for _renderDeferred(). --- lib/bridgedb/test/test_HTTPServer.py | 53 ++ 1 file changed, 53 insertions(+) diff --git a/lib/bridgedb/t

[tor-commits] [bridgedb/master] Remove gimp captcha unittest code from recaptcha unittest setUp().

2014-03-25 Thread isis
commit 2c41a3f7c1606ccc26812db913e11808ffabc0f8 Author: Isis Lovecruft Date: Wed Mar 26 05:00:20 2014 + Remove gimp captcha unittest code from recaptcha unittest setUp(). --- lib/bridgedb/test/test_HTTPServer.py |5 - 1 file changed, 5 deletions(-) diff --git a/lib/bridgedb/te

[tor-commits] [bridgedb/master] Give the PluggableTransports class a real docstring.

2014-03-25 Thread isis
commit 18d8d30bf67c13396516cb980cd9523720aa2b40 Author: Isis Lovecruft Date: Thu Mar 20 12:46:17 2014 + Give the PluggableTransports class a real docstring. --- lib/bridgedb/Bridges.py | 52 +++ 1 file changed, 48 insertions(+), 4 deletions

[tor-commits] [bridgedb/master] Change ReCaptchaProtectedResource.render_POST() to call _renderDeferred().

2014-03-25 Thread isis
commit 454e0f7870575a362d1d162918519f1e1fda5179 Author: Isis Lovecruft Date: Tue Mar 25 22:30:19 2014 + Change ReCaptchaProtectedResource.render_POST() to call _renderDeferred(). * FIXES #11218 (again). --- lib/bridgedb/HTTPServer.py | 12 1 file changed, 8 ins

[tor-commits] [bridgedb/master] Merge branch 'fix/11231-additional-bug-fixes' into develop

2014-03-25 Thread isis
commit 00eaf9160f65c16c725ed7f05ac0583b9da63dc0 Merge: 7fdde31 b4f88ad Author: Isis Lovecruft Date: Fri Mar 21 22:30:10 2014 + Merge branch 'fix/11231-additional-bug-fixes' into develop lib/bridgedb/HTTPServer.py | 14 +- lib/bridgedb/txrecaptcha.py | 12 ++--

[tor-commits] [bridgedb/master] Remove 'installed-files.txt' after `make uninstall` completes.

2014-03-25 Thread isis
commit 97e261d1ba04d42e948d6f417ebd1878bbce5004 Author: Isis Lovecruft Date: Tue Mar 25 00:43:21 2014 + Remove 'installed-files.txt' after `make uninstall` completes. --- Makefile |1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index abf392e..edfc69f 100644 -

[tor-commits] [bridgedb/master] Add class wrapper for requesthelper.DummyRequest to support redirects.

2014-03-25 Thread isis
commit ad774181faa5cd367e4173ce14a4449a3164abeb Author: Isis Lovecruft Date: Wed Mar 19 17:57:09 2014 + Add class wrapper for requesthelper.DummyRequest to support redirects. --- lib/bridgedb/test/test_HTTPServer.py | 20 1 file changed, 20 insertions(+) diff --

[tor-commits] [bridgedb/master] Remove a superfluous error message about gettext files.

2014-03-25 Thread isis
commit 31ec211fd62da1d816d3ecf73986f30c021bf097 Author: Isis Lovecruft Date: Wed Mar 26 04:58:31 2014 + Remove a superfluous error message about gettext files. --- lib/bridgedb/HTTPServer.py |3 --- 1 file changed, 3 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridg

[tor-commits] [bridgedb/master] Cleanup imports in bridgedb.HTTPServer.

2014-03-25 Thread isis
commit dd67a2830d4366f966e780818abc7c94fede16bf Author: Isis Lovecruft Date: Tue Mar 25 22:13:18 2014 + Cleanup imports in bridgedb.HTTPServer. * CHANGE all objects named `resource` to something more specific, otherwise we cannot do `from twisted.web import resource`.

[tor-commits] [bridgedb/master] Change unittests for reCaptcha render_POST() to check NOT_DONE_YET.

2014-03-25 Thread isis
commit a3bb0ec066907bbf3b888b232d6b64a8a3c2f2ca Author: Isis Lovecruft Date: Wed Mar 26 05:03:10 2014 + Change unittests for reCaptcha render_POST() to check NOT_DONE_YET. --- lib/bridgedb/test/test_HTTPServer.py |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --gi

[tor-commits] [bridgedb/master] Add unittests for HTTPServer.WebResourceOptions.

2014-03-25 Thread isis
commit 27280d9fc6aa527eb7a80708df1b25195840567a Author: Isis Lovecruft Date: Wed Mar 26 05:10:26 2014 + Add unittests for HTTPServer.WebResourceOptions. --- lib/bridgedb/test/test_HTTPServer.py | 26 ++ 1 file changed, 26 insertions(+) diff --git a/lib/bridge

[tor-commits] [bridgedb/master] Change checkSolution() unittest to check for tuple.

2014-03-25 Thread isis
commit 9ec8802c7b326bfd518d70211e52afc14fc57e4e Author: Isis Lovecruft Date: Wed Mar 26 05:02:03 2014 + Change checkSolution() unittest to check for tuple. --- lib/bridgedb/test/test_HTTPServer.py |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb

[tor-commits] [bridgedb/master] Add a steaming pile of XXXs and FIXMEs to problems in WebResourceBridges.

2014-03-25 Thread isis
commit 17f9650dfdcd0a0a00bd245295fa957efe3e7dfc Author: Isis Lovecruft Date: Wed Mar 19 18:27:01 2014 + Add a steaming pile of XXXs and FIXMEs to problems in WebResourceBridges. --- lib/bridgedb/HTTPServer.py | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff

[tor-commits] [bridgedb/master] Remove old scripts/gen_bridge_descriptors; use leekspin.

2014-03-25 Thread isis
commit c9ba8cffb49e063690c456f97978aaaf279f92df Author: Isis Lovecruft Date: Mon Mar 24 03:27:30 2014 + Remove old scripts/gen_bridge_descriptors; use leekspin. --- scripts/gen_bridge_descriptors | 870 1 file changed, 870 deletions(-) diff --

[tor-commits] [bridgedb/master] Use the class wrapper DummyRequest in unittests in test_HTTPServer.py.

2014-03-25 Thread isis
commit 3d6a4ca6f0aaba53785ab935ddc036549e925a7e Author: Isis Lovecruft Date: Wed Mar 19 17:58:48 2014 + Use the class wrapper DummyRequest in unittests in test_HTTPServer.py. --- lib/bridgedb/test/test_HTTPServer.py | 36 +- 1 file changed, 5 insertion

[tor-commits] [bridgedb/master] Merge branch 'fix/11231-blank-captcha-field' into develop

2014-03-25 Thread isis
commit 7fdde318ce5446ff55646ccde44f7586d2d411b6 Merge: 18d8d30 a4dd886 Author: Isis Lovecruft Date: Fri Mar 21 22:27:09 2014 + Merge branch 'fix/11231-blank-captcha-field' into develop lib/bridgedb/HTTPServer.py|8 +- lib/bridgedb/test/test_HTTPServer.py | 597 ++

[tor-commits] [bridgedb/master] More import cleanups for HTTPServer.

2014-03-25 Thread isis
commit 1234ed25027bff7936b5bc32d32233970ed2813e Author: Isis Lovecruft Date: Tue Mar 25 22:21:11 2014 + More import cleanups for HTTPServer. * CHANGE `from twisted.web.server import Site` to import the entire `server` module instead. --- lib/bridgedb/HTTPServer.py |

[tor-commits] [bridgedb/master] A couple PEP8 whitespace fixes in docstrings for HTTPServer.

2014-03-25 Thread isis
commit 30c63975d03dd2ab26c9ecf35fa190d7e732512b Author: Isis Lovecruft Date: Tue Mar 25 22:23:13 2014 + A couple PEP8 whitespace fixes in docstrings for HTTPServer. --- lib/bridgedb/HTTPServer.py |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/

[tor-commits] [bridgedb/master] Remove `cat bridgedb.log` from after tests in .travis.yml.

2014-03-25 Thread isis
commit 80a133156db63aff278470f9c9ea3e95473c6f2a Author: Isis Lovecruft Date: Tue Mar 25 03:04:37 2014 + Remove `cat bridgedb.log` from after tests in .travis.yml. --- .travis.yml |1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 902c3b4..5553a81 1006

[tor-commits] [bridgedb/master] Add unittests for HTTPServer.WebResourceBridges.

2014-03-25 Thread isis
commit a4dd886c34ce6f1c30d752d68f42dd8eefd260fc Author: Isis Lovecruft Date: Wed Mar 19 18:08:26 2014 + Add unittests for HTTPServer.WebResourceBridges. --- lib/bridgedb/test/test_HTTPServer.py | 136 ++ 1 file changed, 136 insertions(+) diff --git a/l

[tor-commits] [bridgedb/master] Remove superfluous descriptor generation.

2014-03-25 Thread isis
commit 3f3ead057007b2dceb0575267b1784c61241f110 Author: Isis Lovecruft Date: Mon Mar 24 03:14:04 2014 + Remove superfluous descriptor generation. --- .travis.yml |3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9858edf..8d8bfcf 100644 --- a/.trav

[tor-commits] [bridgedb/master] Fix txrecaptcha.submit() to always return Deferreds.

2014-03-25 Thread isis
commit b4f88aded4fd6cc60be0129e1b6d0bd708d392c7 Author: Isis Lovecruft Date: Wed Mar 19 18:30:12 2014 + Fix txrecaptcha.submit() to always return Deferreds. All returned Deferreds callback with RecaptchaResponse objects. This way, we do not need additional code to check if

[tor-commits] [bridgedb/master] Add a docstring and comment to checkResponse() in ReCaptchaProtectedResource.

2014-03-25 Thread isis
commit 228d7e0856cb88723531cb76db12c3a9b32acd5a Author: Isis Lovecruft Date: Wed Mar 26 04:57:56 2014 + Add a docstring and comment to checkResponse() in ReCaptchaProtectedResource. --- lib/bridgedb/HTTPServer.py | 11 +++ 1 file changed, 11 insertions(+) diff --git a/lib/b

[tor-commits] [bridgedb/master] Change ReCaptchaProtectedResource.checkResponse() to also return request.

2014-03-25 Thread isis
commit 1bc823d54b507438972b53cc6774de7c6d626ab4 Author: Isis Lovecruft Date: Tue Mar 25 22:24:10 2014 + Change ReCaptchaProtectedResource.checkResponse() to also return request. We need to return the original request, not just the boolean representing the validity of the CA

[tor-commits] [bridgedb/master] Add leekspin dependency; modify test_bridgedb and bridgedb.runner apropos.

2014-03-25 Thread isis
commit 6d991ba844be61f944b13ca4a7077c03464406a0 Author: Isis Lovecruft Date: Mon Mar 24 03:12:52 2014 + Add leekspin dependency; modify test_bridgedb and bridgedb.runner apropos. --- .travis.yml|4 ++-- lib/bridgedb/runner.py |2 +- lib/bridg

[tor-commits] [bridgedb/master] Merge branch 'fix/11219-httpconnpool' into develop

2014-03-25 Thread isis
commit 984ea10c316d1ce4dbd38339f3157a4f9e5c1190 Merge: f523014 bd50039 Author: Isis Lovecruft Date: Mon Mar 17 01:48:32 2014 + Merge branch 'fix/11219-httpconnpool' into develop lib/bridgedb/txrecaptcha.py | 40 +--- 1 file changed, 29 insertions(

[tor-commits] [bridgedb/master] Make webserver Tor logo link to torproject.org.

2014-03-25 Thread isis
commit bc0f1d1b72a2e34277209ce97b2cbc6ce4d1b103 Author: Isis Lovecruft Date: Mon Mar 17 05:14:09 2014 + Make webserver Tor logo link to torproject.org. --- lib/bridgedb/templates/base.html |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/templates/b

[tor-commits] [bridgedb/master] Add optional debugging logs to test_HTTPServer.py.

2014-03-25 Thread isis
commit 619d0a588f0c0fe6cd9a2d1a812258c8042acb30 Author: Isis Lovecruft Date: Wed Mar 19 17:43:28 2014 + Add optional debugging logs to test_HTTPServer.py. --- lib/bridgedb/test/test_HTTPServer.py |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/t

[tor-commits] [bridgedb/master] Merge branch 'master' into develop

2014-03-25 Thread isis
commit d40b410899b3a5f071ba7f750f2db481800a181f Merge: ac9aa95 783babc Author: Isis Lovecruft Date: Sun Mar 16 19:02:28 2014 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.t

[tor-commits] [bridgedb/master] Rearrange logging calls during pygeoip import in HTTPServer.py.

2014-03-25 Thread isis
commit e2044209095f1a00ae65c998dc93f64796dd9e6e Author: Isis Lovecruft Date: Mon Mar 17 22:56:51 2014 + Rearrange logging calls during pygeoip import in HTTPServer.py. --- lib/bridgedb/HTTPServer.py |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/bridge

[tor-commits] [bridgedb/master] Tweak the log message strings in EmailServer.replyToMail().

2014-03-25 Thread isis
commit 5e40f67141201aa9f5561319b32069c130899160 Author: Isis Lovecruft Date: Mon Mar 17 03:01:14 2014 + Tweak the log message strings in EmailServer.replyToMail(). --- lib/bridgedb/EmailServer.py |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/bridge

[tor-commits] [bridgedb/master] Add CHANGELOG entry for 0.1.6.

2014-03-25 Thread isis
commit d808f7a6de915cbb9a77f04fa6207d388225413a Author: Isis Lovecruft Date: Mon Mar 17 02:04:59 2014 + Add CHANGELOG entry for 0.1.6. --- CHANGELOG |8 1 file changed, 8 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b8c9d71..bf895ad 100644 --- a/CHANGELOG +++ b/

[tor-commits] [bridgedb/master] Add a mocked DummyIPBasedDistributor class to test_HTTPServer.py.

2014-03-25 Thread isis
commit 6fcf0121296067f7e47721af315ca5b85021e8b8 Author: Isis Lovecruft Date: Wed Mar 19 17:56:26 2014 + Add a mocked DummyIPBasedDistributor class to test_HTTPServer.py. A distributor is a required parameter to the `HTTPServer.WebResourceBridges` class. This one merely cr

[tor-commits] [bridgedb/develop] Update translations.

2014-03-25 Thread isis
commit 43b069d31f32e2596bc4ce014f8b8fb214714059 Author: Isis Lovecruft Date: Wed Mar 26 05:27:58 2014 + Update translations. --- lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po| 102 ++ lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po| 104 +++

[tor-commits] [bridgedb/master] Always expect a Deferred from ReCaptcha.checkSolution().

2014-03-25 Thread isis
commit 738101ac291235cc1415f4db5c9c023b6521e34f Author: Isis Lovecruft Date: Wed Mar 19 18:03:15 2014 + Always expect a Deferred from ReCaptcha.checkSolution(). Currently, we `checkSolution()` will return a RecaptchaResponse if the HTTP POST argument fields are blank. Other

[tor-commits] [bridgedb/master] Fix class and __init__ docstrings for EmailBasedDistributor.

2014-03-25 Thread isis
commit ce8604c52f4b9f1488a9676794116addccb0b78a Author: Isis Lovecruft Date: Mon Mar 17 03:04:19 2014 + Fix class and __init__ docstrings for EmailBasedDistributor. --- lib/bridgedb/Dist.py | 24 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/

[tor-commits] [bridgedb/master] Explicitly require CaptchaProtectedResource.checkSolution() to be True.

2014-03-25 Thread isis
commit acf37dc00b4d9e2b8e3619a56f1711bb503d9e5b Author: Isis Lovecruft Date: Tue Mar 18 04:50:04 2014 + Explicitly require CaptchaProtectedResource.checkSolution() to be True. * FIXES #11231. --- lib/bridgedb/HTTPServer.py |2 +- 1 file changed, 1 insertion(+), 1 deletion

[tor-commits] [bridgedb/master] Update bridgedb.conf with changes from bridgedb-admin.git repo.

2014-03-25 Thread isis
commit bd1b9cafe102fc6a12aa420ce3b3cb37f53c8ad0 Author: Isis Lovecruft Date: Mon Mar 17 01:59:46 2014 + Update bridgedb.conf with changes from bridgedb-admin.git repo. --- bridgedb.conf |7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/bridgedb.conf b/bridge

[tor-commits] [bridgedb/master] Change Contact link on webserver to go to support desk.

2014-03-25 Thread isis
commit 2912ffc17f262cedb37452effee59eb48c31fdd8 Author: Isis Lovecruft Date: Mon Mar 17 05:15:55 2014 + Change Contact link on webserver to go to support desk. --- lib/bridgedb/templates/base.html |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/templ

[tor-commits] [bridgedb/master] PEP8 whitespace fixes for EmailServer.replyToMail().

2014-03-25 Thread isis
commit cae8198956404771b3467581a5db5758df89ce59 Author: Isis Lovecruft Date: Mon Mar 17 03:02:24 2014 + PEP8 whitespace fixes for EmailServer.replyToMail(). --- lib/bridgedb/EmailServer.py |9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Emai

[tor-commits] [bridgedb/master] Change the requested pagename in CaptchaProtectedResourceTests unittests.

2014-03-25 Thread isis
commit 25eb893487855f7449610c60895b7bd79f6458e3 Author: Isis Lovecruft Date: Wed Mar 19 17:44:36 2014 + Change the requested pagename in CaptchaProtectedResourceTests unittests. --- lib/bridgedb/test/test_HTTPServer.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --gi

[tor-commits] [bridgedb/master] Fix ReCaptchaProtectedResource.checkSolution() to pull response from deferred.

2014-03-25 Thread isis
commit 45876ea43d4aa570d5801aed244d753624af9543 Author: Isis Lovecruft Date: Mon Mar 17 00:05:34 2014 + Fix ReCaptchaProtectedResource.checkSolution() to pull response from deferred. * FIXES a bug introduced in #11127 where checkSolution() was expecting the boolean res

[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

2014-03-25 Thread isis
commit eb5abdcb75e94f87013a8a865a3f5978dd30c660 Merge: 24dc8dc f266f32 Author: Isis Lovecruft Date: Wed Mar 26 05:46:59 2014 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torp

[tor-commits] [bridgedb/master] Move HTTPServer.geoipdb to _geoipdb and outside try function.

2014-03-25 Thread isis
commit e6e7552e8c8207ea04c42d209ec735a3c12b2238 Author: Isis Lovecruft Date: Mon Mar 17 22:53:30 2014 + Move HTTPServer.geoipdb to _geoipdb and outside try function. * If it's outside the try function, it's easier to change from other modules (as well as for unittests)

[tor-commits] [bridgedb/master] Start writing unittests for the bridgedb.HTTPServer module.

2014-03-25 Thread isis
commit 9a4bd295a89f2be7f700bfa68d34bcba03954e40 Author: Isis Lovecruft Date: Tue Mar 18 04:12:46 2014 + Start writing unittests for the bridgedb.HTTPServer module. The ReCaptchaProtectedResourceTests.test_render_POST_* unittests expose the bug in #11231. --- lib/bridgedb/t

[tor-commits] [bridgedb/develop] Update CHANGELOG with additional changes for 0.1.6.

2014-03-25 Thread isis
commit 24dc8dc82033cbd8ee14d1c06db1e2a3fbcfdbd6 Author: Isis Lovecruft Date: Wed Mar 26 05:42:51 2014 + Update CHANGELOG with additional changes for 0.1.6. --- CHANGELOG |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index bf895ad..09

[tor-commits] [bridgedb/master] Add link to CHANGELOG from webserver.

2014-03-25 Thread isis
commit f30cc6d2f2eabc5129a2e572707f6fc53c005e75 Author: Isis Lovecruft Date: Mon Mar 17 05:15:29 2014 + Add link to CHANGELOG from webserver. --- lib/bridgedb/templates/base.html |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/templates/base.h

[tor-commits] [bridgedb/master] Fix X-Forwarded-For unittests in CaptchaProtectedResourceTests.

2014-03-25 Thread isis
commit bbfa41304d0b4a7ec30bceadfc6bc5b3b923a7d7 Author: Isis Lovecruft Date: Wed Mar 19 18:00:49 2014 + Fix X-Forwarded-For unittests in CaptchaProtectedResourceTests. Apparently, we can't do: request.setHeader('X-Forwarded-For', '1.1.1.1') because then Br

[tor-commits] [bridgedb/master] Update documentation for CaptchaProtectedResource.getCaptchaImage().

2014-03-25 Thread isis
commit 573996bd57420ccf5d009a95f20fdc6367edd24a Author: Isis Lovecruft Date: Tue Mar 18 04:48:06 2014 + Update documentation for CaptchaProtectedResource.getCaptchaImage(). --- lib/bridgedb/HTTPServer.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bri

[tor-commits] [bridgedb/master] Add a real docstring to EmailServer.replyToMail().

2014-03-25 Thread isis
commit 1e330cb61bce46f49b29474f8a031d46726ac213 Author: Isis Lovecruft Date: Mon Mar 17 02:59:08 2014 + Add a real docstring to EmailServer.replyToMail(). --- lib/bridgedb/EmailServer.py | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/

[tor-commits] [bridgedb/master] Merge branch 'fix/11218-deferred-solution-isvalid' into develop

2014-03-25 Thread isis
commit f5230149ea962a652512440f29ccd1d2fbf233a4 Merge: d40b410 45876ea Author: Isis Lovecruft Date: Mon Mar 17 00:36:44 2014 + Merge branch 'fix/11218-deferred-solution-isvalid' into develop lib/bridgedb/HTTPServer.py | 25 +++-- 1 file changed, 15 insertions(+),

[tor-commits] [bridgedb/master] Fix CaptchaProtectedResourceTests.test_render_GET_noCaptcha unittest.

2014-03-25 Thread isis
commit 7753289270a992dd51326164803ff4c7076e4da8 Author: Isis Lovecruft Date: Tue Mar 18 04:39:38 2014 + Fix CaptchaProtectedResourceTests.test_render_GET_noCaptcha unittest. We shouldn't return ``(None, None)`` in a stub method when all the other methods and child classes e

[tor-commits] [bridgedb/master] Fix typo in inline comment in HTTPServer.

2014-03-25 Thread isis
commit fa1a5612592b72da5630a6c7d00cb4c51602ab61 Author: Isis Lovecruft Date: Mon Mar 17 22:55:17 2014 + Fix typo in inline comment in HTTPServer. --- lib/bridgedb/HTTPServer.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridg

[tor-commits] [bridgedb/master] Only use `t.w.client.HTTPConnectionPool` if available.

2014-03-25 Thread isis
commit bd5003961479b047477124e969f9e51850249c38 Author: Isis Lovecruft Date: Mon Mar 17 00:58:20 2014 + Only use `t.w.client.HTTPConnectionPool` if available. * CHANGES bridgedb.txrecaptcha to create agents using the HTTPConnectionPool, only if our Twisted version is h

[tor-commits] [bridgedb/develop] Remove a superfluous error message about gettext files.

2014-03-25 Thread isis
commit 31ec211fd62da1d816d3ecf73986f30c021bf097 Author: Isis Lovecruft Date: Wed Mar 26 04:58:31 2014 + Remove a superfluous error message about gettext files. --- lib/bridgedb/HTTPServer.py |3 --- 1 file changed, 3 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridg

[tor-commits] [bridgedb/develop] Remove gimp captcha unittest code from recaptcha unittest setUp().

2014-03-25 Thread isis
commit 2c41a3f7c1606ccc26812db913e11808ffabc0f8 Author: Isis Lovecruft Date: Wed Mar 26 05:00:20 2014 + Remove gimp captcha unittest code from recaptcha unittest setUp(). --- lib/bridgedb/test/test_HTTPServer.py |5 - 1 file changed, 5 deletions(-) diff --git a/lib/bridgedb/te

[tor-commits] [bridgedb/develop] Merge branch 'release-0.1.6'

2014-03-25 Thread isis
commit f266f32c365eb7a16cf156cc02f7e492266a7b51 Merge: 783babc 24dc8dc Author: Isis Lovecruft Date: Wed Mar 26 05:46:11 2014 + Merge branch 'release-0.1.6' .travis.yml |8 +- CHANGELOG | 13 + Makefile

[tor-commits] [bridgedb/develop] Change checkSolution() unittest to check for tuple.

2014-03-25 Thread isis
commit 9ec8802c7b326bfd518d70211e52afc14fc57e4e Author: Isis Lovecruft Date: Wed Mar 26 05:02:03 2014 + Change checkSolution() unittest to check for tuple. --- lib/bridgedb/test/test_HTTPServer.py |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb

[tor-commits] [bridgedb/develop] Add unittests for HTTPServer.WebResourceOptions.

2014-03-25 Thread isis
commit 27280d9fc6aa527eb7a80708df1b25195840567a Author: Isis Lovecruft Date: Wed Mar 26 05:10:26 2014 + Add unittests for HTTPServer.WebResourceOptions. --- lib/bridgedb/test/test_HTTPServer.py | 26 ++ 1 file changed, 26 insertions(+) diff --git a/lib/bridge

[tor-commits] [bridgedb/develop] Merge branch 'hotfix/11218-async-render' into develop

2014-03-25 Thread isis
commit 9eca0869ffe25057f0e23bf39115945e70b2e68b Merge: 80a1331 a3bb0ec Author: Isis Lovecruft Date: Wed Mar 26 05:10:08 2014 + Merge branch 'hotfix/11218-async-render' into develop Makefile |4 +- lib/bridgedb/HTTPServer.py | 157

[tor-commits] [bridgedb/develop] Add a docstring and comment to checkResponse() in ReCaptchaProtectedResource.

2014-03-25 Thread isis
commit 228d7e0856cb88723531cb76db12c3a9b32acd5a Author: Isis Lovecruft Date: Wed Mar 26 04:57:56 2014 + Add a docstring and comment to checkResponse() in ReCaptchaProtectedResource. --- lib/bridgedb/HTTPServer.py | 11 +++ 1 file changed, 11 insertions(+) diff --git a/lib/b

[tor-commits] [bridgedb/develop] Change unittests for reCaptcha render_POST() to check NOT_DONE_YET.

2014-03-25 Thread isis
commit a3bb0ec066907bbf3b888b232d6b64a8a3c2f2ca Author: Isis Lovecruft Date: Wed Mar 26 05:03:10 2014 + Change unittests for reCaptcha render_POST() to check NOT_DONE_YET. --- lib/bridgedb/test/test_HTTPServer.py |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --gi

[tor-commits] [bridgedb/develop] Add leekspin dependency; modify test_bridgedb and bridgedb.runner apropos.

2014-03-25 Thread isis
commit 6d991ba844be61f944b13ca4a7077c03464406a0 Author: Isis Lovecruft Date: Mon Mar 24 03:12:52 2014 + Add leekspin dependency; modify test_bridgedb and bridgedb.runner apropos. --- .travis.yml|4 ++-- lib/bridgedb/runner.py |2 +- lib/bridg

[tor-commits] [bridgedb/develop] Add unittests for _renderDeferred().

2014-03-25 Thread isis
commit 3fe40199972595895c05d8760dade246e8134fe4 Author: Isis Lovecruft Date: Wed Mar 26 05:01:04 2014 + Add unittests for _renderDeferred(). --- lib/bridgedb/test/test_HTTPServer.py | 53 ++ 1 file changed, 53 insertions(+) diff --git a/lib/bridgedb/t

[tor-commits] [bridgedb/develop] Add a steaming pile of XXXs and FIXMEs to problems in WebResourceBridges.

2014-03-25 Thread isis
commit 17f9650dfdcd0a0a00bd245295fa957efe3e7dfc Author: Isis Lovecruft Date: Wed Mar 19 18:27:01 2014 + Add a steaming pile of XXXs and FIXMEs to problems in WebResourceBridges. --- lib/bridgedb/HTTPServer.py | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff

[tor-commits] [bridgedb/develop] Add coverage pragma lines to blanket excepts in HTTPServer.

2014-03-25 Thread isis
commit 4eb7ef398e2e2c28f19031fca6595c679c613fe9 Author: Isis Lovecruft Date: Wed Mar 26 04:56:31 2014 + Add coverage pragma lines to blanket excepts in HTTPServer. They are gross, but we have to have these general excepts everywhere, otherwise users could be shown a traceba

[tor-commits] [bridgedb/develop] Merge branch 'fix/11196-use-leekspin_r1' into develop

2014-03-25 Thread isis
commit 715ab6a93636f7616036adcd72cf168ede752b42 Merge: 97e261d c9ba8cf Author: Isis Lovecruft Date: Tue Mar 25 02:28:31 2014 + Merge branch 'fix/11196-use-leekspin_r1' into develop .travis.yml|7 +- lib/bridgedb/runner.py |2 +- lib/bridgedb

[tor-commits] [bridgedb/develop] Add --rcfile option to additional coverage lines in Makefile.

2014-03-25 Thread isis
commit eabc57bdb24dec6d4693463a7029b1106bf71778 Author: Isis Lovecruft Date: Wed Mar 26 04:59:13 2014 + Add --rcfile option to additional coverage lines in Makefile. --- Makefile |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index edfc69

[tor-commits] [bridgedb/develop] Change ReCaptchaProtectedResource.checkResponse() to also return request.

2014-03-25 Thread isis
commit 1bc823d54b507438972b53cc6774de7c6d626ab4 Author: Isis Lovecruft Date: Tue Mar 25 22:24:10 2014 + Change ReCaptchaProtectedResource.checkResponse() to also return request. We need to return the original request, not just the boolean representing the validity of the CA

[tor-commits] [bridgedb/develop] Add ReCaptchaProtectedResource._renderDeferred() to render deferred resources.

2014-03-25 Thread isis
commit db8eef49536f0c18891bdf1f5151733e07ffc8d3 Author: Isis Lovecruft Date: Tue Mar 25 22:28:45 2014 + Add ReCaptchaProtectedResource._renderDeferred() to render deferred resources. --- lib/bridgedb/HTTPServer.py | 33 + 1 file changed, 33 insertions

[tor-commits] [bridgedb/develop] More import cleanups for HTTPServer.

2014-03-25 Thread isis
commit 1234ed25027bff7936b5bc32d32233970ed2813e Author: Isis Lovecruft Date: Tue Mar 25 22:21:11 2014 + More import cleanups for HTTPServer. * CHANGE `from twisted.web.server import Site` to import the entire `server` module instead. --- lib/bridgedb/HTTPServer.py |

[tor-commits] [bridgedb/develop] Fix txrecaptcha.submit() to always return Deferreds.

2014-03-25 Thread isis
commit b4f88aded4fd6cc60be0129e1b6d0bd708d392c7 Author: Isis Lovecruft Date: Wed Mar 19 18:30:12 2014 + Fix txrecaptcha.submit() to always return Deferreds. All returned Deferreds callback with RecaptchaResponse objects. This way, we do not need additional code to check if

[tor-commits] [bridgedb/develop] Remove `cat bridgedb.log` from after tests in .travis.yml.

2014-03-25 Thread isis
commit 80a133156db63aff278470f9c9ea3e95473c6f2a Author: Isis Lovecruft Date: Tue Mar 25 03:04:37 2014 + Remove `cat bridgedb.log` from after tests in .travis.yml. --- .travis.yml |1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 902c3b4..5553a81 1006

[tor-commits] [bridgedb/develop] A couple PEP8 whitespace fixes in docstrings for HTTPServer.

2014-03-25 Thread isis
commit 30c63975d03dd2ab26c9ecf35fa190d7e732512b Author: Isis Lovecruft Date: Tue Mar 25 22:23:13 2014 + A couple PEP8 whitespace fixes in docstrings for HTTPServer. --- lib/bridgedb/HTTPServer.py |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/

[tor-commits] [bridgedb/develop] Merge branch 'fix/11231-blank-captcha-field' into develop

2014-03-25 Thread isis
commit 7fdde318ce5446ff55646ccde44f7586d2d411b6 Merge: 18d8d30 a4dd886 Author: Isis Lovecruft Date: Fri Mar 21 22:27:09 2014 + Merge branch 'fix/11231-blank-captcha-field' into develop lib/bridgedb/HTTPServer.py|8 +- lib/bridgedb/test/test_HTTPServer.py | 597 ++

[tor-commits] [bridgedb/develop] Change ReCaptchaProtectedResource.render_POST() to call _renderDeferred().

2014-03-25 Thread isis
commit 454e0f7870575a362d1d162918519f1e1fda5179 Author: Isis Lovecruft Date: Tue Mar 25 22:30:19 2014 + Change ReCaptchaProtectedResource.render_POST() to call _renderDeferred(). * FIXES #11218 (again). --- lib/bridgedb/HTTPServer.py | 12 1 file changed, 8 ins

[tor-commits] [bridgedb/develop] Remove old scripts/gen_bridge_descriptors; use leekspin.

2014-03-25 Thread isis
commit c9ba8cffb49e063690c456f97978aaaf279f92df Author: Isis Lovecruft Date: Mon Mar 24 03:27:30 2014 + Remove old scripts/gen_bridge_descriptors; use leekspin. --- scripts/gen_bridge_descriptors | 870 1 file changed, 870 deletions(-) diff --

[tor-commits] [bridgedb/develop] Merge branch 'fix/11231-additional-bug-fixes' into develop

2014-03-25 Thread isis
commit 00eaf9160f65c16c725ed7f05ac0583b9da63dc0 Merge: 7fdde31 b4f88ad Author: Isis Lovecruft Date: Fri Mar 21 22:30:10 2014 + Merge branch 'fix/11231-additional-bug-fixes' into develop lib/bridgedb/HTTPServer.py | 14 +- lib/bridgedb/txrecaptcha.py | 12 ++--

[tor-commits] [bridgedb/develop] Remove superfluous descriptor generation.

2014-03-25 Thread isis
commit 3f3ead057007b2dceb0575267b1784c61241f110 Author: Isis Lovecruft Date: Mon Mar 24 03:14:04 2014 + Remove superfluous descriptor generation. --- .travis.yml |3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9858edf..8d8bfcf 100644 --- a/.trav

[tor-commits] [bridgedb/develop] Remove 'installed-files.txt' after `make uninstall` completes.

2014-03-25 Thread isis
commit 97e261d1ba04d42e948d6f417ebd1878bbce5004 Author: Isis Lovecruft Date: Tue Mar 25 00:43:21 2014 + Remove 'installed-files.txt' after `make uninstall` completes. --- Makefile |1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index abf392e..edfc69f 100644 -

[tor-commits] [bridgedb/develop] Cleanup imports in bridgedb.HTTPServer.

2014-03-25 Thread isis
commit dd67a2830d4366f966e780818abc7c94fede16bf Author: Isis Lovecruft Date: Tue Mar 25 22:13:18 2014 + Cleanup imports in bridgedb.HTTPServer. * CHANGE all objects named `resource` to something more specific, otherwise we cannot do `from twisted.web import resource`.

[tor-commits] [bridgedb/develop] Use the class wrapper DummyRequest in unittests in test_HTTPServer.py.

2014-03-25 Thread isis
commit 3d6a4ca6f0aaba53785ab935ddc036549e925a7e Author: Isis Lovecruft Date: Wed Mar 19 17:58:48 2014 + Use the class wrapper DummyRequest in unittests in test_HTTPServer.py. --- lib/bridgedb/test/test_HTTPServer.py | 36 +- 1 file changed, 5 insertion

[tor-commits] [bridgedb/develop] Add unittests for HTTPServer.WebResourceBridges.

2014-03-25 Thread isis
commit a4dd886c34ce6f1c30d752d68f42dd8eefd260fc Author: Isis Lovecruft Date: Wed Mar 19 18:08:26 2014 + Add unittests for HTTPServer.WebResourceBridges. --- lib/bridgedb/test/test_HTTPServer.py | 136 ++ 1 file changed, 136 insertions(+) diff --git a/l

[tor-commits] [bridgedb/develop] Always expect a Deferred from ReCaptcha.checkSolution().

2014-03-25 Thread isis
commit 738101ac291235cc1415f4db5c9c023b6521e34f Author: Isis Lovecruft Date: Wed Mar 19 18:03:15 2014 + Always expect a Deferred from ReCaptcha.checkSolution(). Currently, we `checkSolution()` will return a RecaptchaResponse if the HTTP POST argument fields are blank. Other

[tor-commits] [bridgedb/develop] Change the requested pagename in CaptchaProtectedResourceTests unittests.

2014-03-25 Thread isis
commit 25eb893487855f7449610c60895b7bd79f6458e3 Author: Isis Lovecruft Date: Wed Mar 19 17:44:36 2014 + Change the requested pagename in CaptchaProtectedResourceTests unittests. --- lib/bridgedb/test/test_HTTPServer.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --gi

[tor-commits] [bridgedb/develop] Fix X-Forwarded-For unittests in CaptchaProtectedResourceTests.

2014-03-25 Thread isis
commit bbfa41304d0b4a7ec30bceadfc6bc5b3b923a7d7 Author: Isis Lovecruft Date: Wed Mar 19 18:00:49 2014 + Fix X-Forwarded-For unittests in CaptchaProtectedResourceTests. Apparently, we can't do: request.setHeader('X-Forwarded-For', '1.1.1.1') because then Br

[tor-commits] [bridgedb/develop] Add a mocked DummyIPBasedDistributor class to test_HTTPServer.py.

2014-03-25 Thread isis
commit 6fcf0121296067f7e47721af315ca5b85021e8b8 Author: Isis Lovecruft Date: Wed Mar 19 17:56:26 2014 + Add a mocked DummyIPBasedDistributor class to test_HTTPServer.py. A distributor is a required parameter to the `HTTPServer.WebResourceBridges` class. This one merely cr

[tor-commits] [bridgedb/develop] Add class wrapper for requesthelper.DummyRequest to support redirects.

2014-03-25 Thread isis
commit ad774181faa5cd367e4173ce14a4449a3164abeb Author: Isis Lovecruft Date: Wed Mar 19 17:57:09 2014 + Add class wrapper for requesthelper.DummyRequest to support redirects. --- lib/bridgedb/test/test_HTTPServer.py | 20 1 file changed, 20 insertions(+) diff --

[tor-commits] [bridgedb/develop] Fix CaptchaProtectedResourceTests.test_render_GET_noCaptcha unittest.

2014-03-25 Thread isis
commit 7753289270a992dd51326164803ff4c7076e4da8 Author: Isis Lovecruft Date: Tue Mar 18 04:39:38 2014 + Fix CaptchaProtectedResourceTests.test_render_GET_noCaptcha unittest. We shouldn't return ``(None, None)`` in a stub method when all the other methods and child classes e

  1   2   >