From aa2ada4cbcfa64467e782f6d7fcf9ebce5712f9d Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 30 Oct 2015 22:58:58 -0400
Subject: [PATCH] Use TRAVIS_BRANCH environment variable

Ref #713
---
 travis/pr-check-base.py | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/travis/pr-check-base.py b/travis/pr-check-base.py
index f3cbab18c..47605b051 100644
--- a/travis/pr-check-base.py
+++ b/travis/pr-check-base.py
@@ -1,11 +1,7 @@
-import json, os, sys
-if sys.version.startswith('2'):
-    from urllib2 import urlopen, HTTPError
-else:
-    from urllib.request import urlopen
-    from urllib.error import HTTPError
+import os, sys
+repo = os.environ.get('TRAVIS_REPO_SLUG', 'dfhack/dfhack').lower()
+branch = os.environ.get('TRAVIS_BRANCH', 'master')
 try:
-    repo = os.environ.get('TRAVIS_REPO_SLUG', 'dfhack/dfhack').lower()
     pr_id = int(os.environ.get('TRAVIS_PULL_REQUEST', 'false'))
 except ValueError:
     print('Not a pull request')
@@ -14,18 +10,7 @@ print('Pull request %s#%i' % (repo, pr_id))
 if repo != 'dfhack/dfhack':
     print('Not in dfhack/dfhack')
     sys.exit(0)
-res = {}
-try:
-    res = json.loads(urlopen('https://api.github.com/repos/%s/pulls/%i' % (repo, pr_id)).read().decode('utf-8'))
-except ValueError:
-    pass
-except HTTPError as e:
-    print('Failed to retrieve PR information from API: %s' % e)
-    sys.exit(2)
-if 'base' not in res or 'ref' not in res['base']:
-    print('Invalid JSON returned from API')
-    sys.exit(2)
-if res['base']['ref'] != 'develop':
+if branch != 'develop':
     print('Not based on develop branch')
     sys.exit(1)
 else: