Merge branch 'pr/308' into develop

sigmavirus24 · sigmavirus24 · commit 942a5aedf23f · 2014-11-12T20:33:00.000-06:00
diff --git a/github3/notifications.py b/github3/notifications.py
@@ -90,7 +90,7 @@ def set_subscription(self, subscribed, ignored):
         url = self._build_url('subscription', base_url=self._api)
         sub = {'subscribed': subscribed, 'ignored': ignored}
         json = self._json(self._put(url, data=dumps(sub)), 200)
-        return Subscription(json, self) if json else None
+        return self._instance_or_null(Subscription, json)
 
     def subscription(self):
         """Checks the status of the user's subscription to this thread.
@@ -99,7 +99,7 @@ def subscription(self):
         """
         url = self._build_url('subscription', base_url=self._api)
         json = self._json(self._get(url), 200)
-        return Subscription(json, self) if json else None
+        return self._instance_or_null(Subscription, json)
 
 
 class Subscription(GitHubCore):
diff --git a/github3/orgs.py b/github3/orgs.py
@@ -358,7 +358,7 @@ def create_repository(self, name, description='', homepage='',
         if int(team_id) > 0:
             data.update({'team_id': team_id})
         json = self._json(self._post(url, data), 201)
-        return Repository(json, self) if json else None
+        return self._instance_or_null(Repository, json)
 
     @requires_auth
     def conceal_member(self, username):
@@ -394,7 +394,7 @@ def create_team(self, name, repo_names=[], permission=''):
                 'permission': permission}
         url = self._build_url('teams', base_url=self._api)
         json = self._json(self._post(url, data), 201)
-        return Team(json, self) if json else None
+        return self._instance_or_null(Team, json)
 
     @requires_auth
     def edit(self, billing_email=None, company=None, email=None, location=None,
@@ -552,7 +552,7 @@ def team(self, team_id):
         if int(team_id) > 0:
             url = self._build_url('teams', str(team_id))
             json = self._json(self._get(url), 200)
-        return Team(json, self) if json else None
+        return self._instance_or_null(Team, json)
 
 
 class Membership(GitHubCore):
