mirror of
https://github.com/status-im/PyGithub.git
synced 2026-08-31 19:01:15 +00:00
Switch to using six (#1189)
With the Python 2.7 deadline fast approaching, modernize the codebase making use of the modernize module to switch to using six, as well as other upcoming features, such as absolute imports . Stop using 2to3 for Travis, yay!
This commit is contained in:
+11
-9
@@ -33,6 +33,7 @@
|
||||
# #
|
||||
################################################################################
|
||||
|
||||
from __future__ import absolute_import
|
||||
import github.GithubObject
|
||||
|
||||
import github.BranchProtection
|
||||
@@ -40,7 +41,8 @@ import github.Commit
|
||||
import github.RequiredPullRequestReviews
|
||||
import github.RequiredStatusChecks
|
||||
|
||||
import Consts
|
||||
from . import Consts
|
||||
import six
|
||||
|
||||
|
||||
class Branch(github.GithubObject.NonCompletableGithubObject):
|
||||
@@ -125,10 +127,10 @@ class Branch(github.GithubObject.NonCompletableGithubObject):
|
||||
changing. Use edit_required_status_checks() to avoid this.
|
||||
"""
|
||||
assert strict is github.GithubObject.NotSet or isinstance(strict, bool), strict
|
||||
assert contexts is github.GithubObject.NotSet or all(isinstance(element, (str, unicode)) or isinstance(element, (str, unicode)) for element in contexts), contexts
|
||||
assert contexts is github.GithubObject.NotSet or all(isinstance(element, (str, six.text_type)) or isinstance(element, (str, six.text_type)) for element in contexts), contexts
|
||||
assert enforce_admins is github.GithubObject.NotSet or isinstance(enforce_admins, bool), enforce_admins
|
||||
assert dismissal_users is github.GithubObject.NotSet or all(isinstance(element, (str, unicode)) or isinstance(element, (str, unicode)) for element in dismissal_users), dismissal_users
|
||||
assert dismissal_teams is github.GithubObject.NotSet or all(isinstance(element, (str, unicode)) or isinstance(element, (str, unicode)) for element in dismissal_teams), dismissal_teams
|
||||
assert dismissal_users is github.GithubObject.NotSet or all(isinstance(element, (str, six.text_type)) or isinstance(element, (str, six.text_type)) for element in dismissal_users), dismissal_users
|
||||
assert dismissal_teams is github.GithubObject.NotSet or all(isinstance(element, (str, six.text_type)) or isinstance(element, (str, six.text_type)) for element in dismissal_teams), dismissal_teams
|
||||
assert dismiss_stale_reviews is github.GithubObject.NotSet or isinstance(dismiss_stale_reviews, bool), dismiss_stale_reviews
|
||||
assert require_code_owner_reviews is github.GithubObject.NotSet or isinstance(require_code_owner_reviews, bool), require_code_owner_reviews
|
||||
assert required_approving_review_count is github.GithubObject.NotSet or isinstance(required_approving_review_count, int), required_approving_review_count
|
||||
@@ -207,7 +209,7 @@ class Branch(github.GithubObject.NonCompletableGithubObject):
|
||||
:contexts: list of strings
|
||||
"""
|
||||
assert strict is github.GithubObject.NotSet or isinstance(strict, bool), strict
|
||||
assert contexts is github.GithubObject.NotSet or all(isinstance(element, (str, unicode)) or isinstance(element, (str, unicode)) for element in contexts), contexts
|
||||
assert contexts is github.GithubObject.NotSet or all(isinstance(element, (str, six.text_type)) or isinstance(element, (str, six.text_type)) for element in contexts), contexts
|
||||
|
||||
post_parameters = {}
|
||||
if strict is not github.GithubObject.NotSet:
|
||||
@@ -250,8 +252,8 @@ class Branch(github.GithubObject.NonCompletableGithubObject):
|
||||
:require_code_owner_reviews: bool
|
||||
:required_approving_review_count: int
|
||||
"""
|
||||
assert dismissal_users is github.GithubObject.NotSet or all(isinstance(element, (str, unicode)) or isinstance(element, (str, unicode)) for element in dismissal_users), dismissal_users
|
||||
assert dismissal_teams is github.GithubObject.NotSet or all(isinstance(element, (str, unicode)) or isinstance(element, (str, unicode)) for element in dismissal_teams), dismissal_teams
|
||||
assert dismissal_users is github.GithubObject.NotSet or all(isinstance(element, (str, six.text_type)) or isinstance(element, (str, six.text_type)) for element in dismissal_users), dismissal_users
|
||||
assert dismissal_teams is github.GithubObject.NotSet or all(isinstance(element, (str, six.text_type)) or isinstance(element, (str, six.text_type)) for element in dismissal_teams), dismissal_teams
|
||||
assert dismiss_stale_reviews is github.GithubObject.NotSet or isinstance(dismiss_stale_reviews, bool), dismiss_stale_reviews
|
||||
assert require_code_owner_reviews is github.GithubObject.NotSet or isinstance(require_code_owner_reviews, bool), require_code_owner_reviews
|
||||
assert required_approving_review_count is github.GithubObject.NotSet or isinstance(required_approving_review_count, int), required_approving_review_count
|
||||
@@ -343,7 +345,7 @@ class Branch(github.GithubObject.NonCompletableGithubObject):
|
||||
:calls: `POST /repos/:owner/:repo/branches/:branch/protection/restrictions <https://developer.github.com/v3/repos/branches>`_
|
||||
:users: list of strings
|
||||
"""
|
||||
assert all(isinstance(element, (str, unicode)) or isinstance(element, (str, unicode)) for element in users), users
|
||||
assert all(isinstance(element, (str, six.text_type)) or isinstance(element, (str, six.text_type)) for element in users), users
|
||||
|
||||
headers, data = self._requester.requestJsonAndCheck(
|
||||
"POST",
|
||||
@@ -356,7 +358,7 @@ class Branch(github.GithubObject.NonCompletableGithubObject):
|
||||
:calls: `POST /repos/:owner/:repo/branches/:branch/protection/restrictions <https://developer.github.com/v3/repos/branches>`_
|
||||
:teams: list of strings
|
||||
"""
|
||||
assert all(isinstance(element, (str, unicode)) or isinstance(element, (str, unicode)) for element in teams), teams
|
||||
assert all(isinstance(element, (str, six.text_type)) or isinstance(element, (str, six.text_type)) for element in teams), teams
|
||||
|
||||
headers, data = self._requester.requestJsonAndCheck(
|
||||
"POST",
|
||||
|
||||
Reference in New Issue
Block a user