diff options
| author | Ib Lundgren <ib.lundgren@gmail.com> | 2013-09-12 11:47:34 +0100 |
|---|---|---|
| committer | Ib Lundgren <ib.lundgren@gmail.com> | 2013-09-12 11:47:34 +0100 |
| commit | 4f9c5bf32008ff5d6c34597737d6fca7613dd769 (patch) | |
| tree | ad4071d8462647efd77b03f4dd870ae60a51173a | |
| parent | 82fca5b2cb8fe647b565bbbe9dc5f36fb69f127d (diff) | |
| parent | 8e4d757e9c041173686d1e55120ba77957f3e5f2 (diff) | |
| download | oauthlib-4f9c5bf32008ff5d6c34597737d6fca7613dd769.tar.gz | |
Merge branch 'master' of https://github.com/idan/oauthlib
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | .travis_install.py | 5 | ||||
| -rw-r--r-- | oauthlib/oauth2/rfc6749/request_validator.py | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 54b031c..dd781a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,8 @@ python: - "pypy" install: + - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors unittest2; fi - pip install nose pycrypto mock - - python .travis_install.py script: - nosetests -w tests diff --git a/.travis_install.py b/.travis_install.py deleted file mode 100644 index a604a0c..0000000 --- a/.travis_install.py +++ /dev/null @@ -1,5 +0,0 @@ -import sys -import subprocess - -if sys.version_info[0] == 2: - subprocess.call(['pip', 'install', 'unittest2']) diff --git a/oauthlib/oauth2/rfc6749/request_validator.py b/oauthlib/oauth2/rfc6749/request_validator.py index 8612366..26171c5 100644 --- a/oauthlib/oauth2/rfc6749/request_validator.py +++ b/oauthlib/oauth2/rfc6749/request_validator.py @@ -223,7 +223,7 @@ class RequestValidator(object): convenient, access control. A powerful way to use scopes would mimic UNIX ACLs and see a scope - as a group with certain privilegues. For a restful API these might + as a group with certain privileges. For a restful API these might map to HTTP verbs instead of read, write and execute. Note, the request.user attribute can be set to the resource owner |