[MediaWiki-commits] [Gerrit] webservice2: EAFP, not LBYL - change (operations/puppet)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/201421 Change subject: webservice2: EAFP, not LBYL .. webservice2: EAFP, not LBYL https://docs.python.org/2/glossary.html#term-lbyl https://docs.python.org/2/glossary.html#term-eafp Change-Id: I6a2d0549326129aa048bcc6620eacb231a4c47ee --- M modules/toollabs/files/webservice2 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/201421/1 diff --git a/modules/toollabs/files/webservice2 b/modules/toollabs/files/webservice2 index a705739..810a22e 100644 --- a/modules/toollabs/files/webservice2 +++ b/modules/toollabs/files/webservice2 @@ -6,6 +6,7 @@ import time import subprocess import argparse +import errno import xml.etree.ElementTree as ET @@ -29,10 +30,13 @@ :param default: Value to return if the file does not exist :return: String containing either contents of the file, or default value -if os.path.exists(path): +try: with open(path) as f: return f.read() -return default +except IOError as e: +if e.errno == errno.ENOENT: +return default +raise def start_web_job(server, release): -- To view, visit https://gerrit.wikimedia.org/r/201421 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a2d0549326129aa048bcc6620eacb231a4c47ee Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] webservice2: EAFP, not LBYL - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: webservice2: EAFP, not LBYL .. webservice2: EAFP, not LBYL https://docs.python.org/2/glossary.html#term-lbyl https://docs.python.org/2/glossary.html#term-eafp Change-Id: I6a2d0549326129aa048bcc6620eacb231a4c47ee --- M modules/toollabs/files/webservice2 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve Yuvipanda: Verified; Looks good to me, approved diff --git a/modules/toollabs/files/webservice2 b/modules/toollabs/files/webservice2 index a705739..810a22e 100644 --- a/modules/toollabs/files/webservice2 +++ b/modules/toollabs/files/webservice2 @@ -6,6 +6,7 @@ import time import subprocess import argparse +import errno import xml.etree.ElementTree as ET @@ -29,10 +30,13 @@ :param default: Value to return if the file does not exist :return: String containing either contents of the file, or default value -if os.path.exists(path): +try: with open(path) as f: return f.read() -return default +except IOError as e: +if e.errno == errno.ENOENT: +return default +raise def start_web_job(server, release): -- To view, visit https://gerrit.wikimedia.org/r/201421 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a2d0549326129aa048bcc6620eacb231a4c47ee Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
