[MediaWiki-commits] [Gerrit] operations/puppet[production]: Follow-up I55032bf7: urlopen context argument was added in P...

2016-09-20 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: Follow-up I55032bf7: urlopen context argument was added in 
Python 2.7.9 too
..


Follow-up I55032bf7: urlopen context argument was added in Python 2.7.9 too

Change-Id: Id0cfcc6907c37c0960b5a614a041f7f974b7fb7b
---
M modules/letsencrypt/files/acme_tiny.py
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/letsencrypt/files/acme_tiny.py 
b/modules/letsencrypt/files/acme_tiny.py
index 96441bb..626afa1 100644
--- a/modules/letsencrypt/files/acme_tiny.py
+++ b/modules/letsencrypt/files/acme_tiny.py
@@ -147,7 +147,10 @@
 ctx = None
 
 try:
-resp = urlopen(wellknown_url, context=ctx)
+if ctx:
+resp = urlopen(wellknown_url, context=ctx)
+else:
+resp = urlopen(wellknown_url)
 resp_data = resp.read().decode('utf8').strip()
 assert resp_data == keyauthorization
 except (IOError, AssertionError):

-- 
To view, visit https://gerrit.wikimedia.org/r/311695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0cfcc6907c37c0960b5a614a041f7f974b7fb7b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Follow-up I55032bf7: urlopen context argument was added in P...

2016-09-20 Thread Alex Monk (Code Review) 
Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311695

Change subject: Follow-up I55032bf7: urlopen context argument was added in 
Python 2.7.9 too
..

Follow-up I55032bf7: urlopen context argument was added in Python 2.7.9 too

Change-Id: Id0cfcc6907c37c0960b5a614a041f7f974b7fb7b
---
M modules/letsencrypt/files/acme_tiny.py
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/311695/1

diff --git a/modules/letsencrypt/files/acme_tiny.py 
b/modules/letsencrypt/files/acme_tiny.py
index 96441bb..626afa1 100644
--- a/modules/letsencrypt/files/acme_tiny.py
+++ b/modules/letsencrypt/files/acme_tiny.py
@@ -147,7 +147,10 @@
 ctx = None
 
 try:
-resp = urlopen(wellknown_url, context=ctx)
+if ctx:
+resp = urlopen(wellknown_url, context=ctx)
+else:
+resp = urlopen(wellknown_url)
 resp_data = resp.read().decode('utf8').strip()
 assert resp_data == keyauthorization
 except (IOError, AssertionError):

-- 
To view, visit https://gerrit.wikimedia.org/r/311695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0cfcc6907c37c0960b5a614a041f7f974b7fb7b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits