Make "s" in "https" optional to match URL w/ regex

msabramo · msabramo · commit 648e584aab23 · 2014-11-05T10:43:42.000-08:00
Some folks may be using a GitHub Enterprise server that doesn't support
HTTPS.
diff --git a/github3/github.py b/github3/github.py
@@ -1000,7 +1000,7 @@ def pubsubhubbub(self, mode, topic, callback, secret=''):
         :returns: bool
         """
         from re import match
-        m = match('https://[\w\d\-\.\:]+/\w+/[\w\._-]+/events/\w+', topic)
+        m = match('https?://[\w\d\-\.\:]+/\w+/[\w\._-]+/events/\w+', topic)
         status = False
         if mode and topic and callback and m:
             data = [('hub.mode', mode), ('hub.topic', topic),
diff --git a/github3/issues/issue.py b/github3/issues/issue.py
@@ -77,7 +77,7 @@ def __init__(self, issue, session=None):
         self.number = issue.get('number')
         #: Dictionary URLs for the pull request (if they exist)
         self.pull_request = issue.get('pull_request')
-        m = match('https://[\w\d\-\.\:]+/(\S+)/(\S+)/(?:issues|pull)/\d+',
+        m = match('https?://[\w\d\-\.\:]+/(\S+)/(\S+)/(?:issues|pull)/\d+',
                   self.html_url)
         #: Returns ('owner', 'repository') this issue was filed on.
         self.repository = m.groups()
diff --git a/github3/pulls.py b/github3/pulls.py
@@ -183,7 +183,7 @@ def __init__(self, pull, session=None):
         #: GitHub.com url for review comments (not a template)
         self.review_comments_url = pull.get('review_comments_url')
 
-        m = match('https://[\w\d\-\.\:]+/(\S+)/(\S+)/(?:issues|pull)?/\d+',
+        m = match('https?://[\w\d\-\.\:]+/(\S+)/(\S+)/(?:issues|pull)?/\d+',
                   self.issue_url)
         #: Returns ('owner', 'repository') this issue was filed on.
         self.repository = m.groups()
