Incorperate upstream fix for captcha module import #571

jglamine · 2016-07-03T18:07:02Z

On windows and OSX, vagrant up fails due to an import error:

==> default:   File "/vagrant/r2/r2/lib/Captcha.py", line 25, in <module>
==> default:     from Captcha.Base import randomIdentifier
==> default: ImportError: No module named Base
==> default: ---- End output of "bash"  "/tmp/chef-script20160703-7426-qg0yug" ----
==> default: Ran "bash"  "/tmp/chef-script20160703-7426-qg0yug" returned 1
==> default: [2016-07-03T17:55:30+00:00] FATAL: Chef::Exceptions::ChildConvergeError: Chef run process exited unsuccessfully (exit code 1)

This was fixed by reddit upstream in reddit-archive/reddit@327a5dc
See also: https://www.reddit.com/r/redditdev/comments/28cf7p/error_with_r2_source_code_no_module_named_base_in/

This change incorporates that fix.

jglamine · 2016-07-03T18:07:27Z

r2/r2/lib/captcha.py

@@ -6,19 +6,21 @@
 # software over a computer network and provide for limited attribution for the
 # Original Developer. In addition, Exhibit A has been modified to be consistent
 # with Exhibit B.
-# 


Looks like my editor also removed some trailing whitespace.

Incorperate upstream fix for captcha module import

92f0542

jglamine reviewed Jul 3, 2016
View reviewed changes

michaelwebb76 merged commit c71f349 into bellroy:master Jul 5, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Incorperate upstream fix for captcha module import #571

Incorperate upstream fix for captcha module import #571

jglamine commented Jul 3, 2016 •

edited

Loading

jglamine Jul 3, 2016

Incorperate upstream fix for captcha module import #571

Incorperate upstream fix for captcha module import #571

Conversation

jglamine commented Jul 3, 2016 • edited Loading

jglamine Jul 3, 2016

Choose a reason for hiding this comment

jglamine commented Jul 3, 2016 •

edited

Loading