Skip to content

Syncing Develop #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 47 commits into from
Sep 12, 2015
Merged

Syncing Develop #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
6f58f7f
Document / test supported python versions.
tseaver May 28, 2013
55fb8f6
Coverage for o._version.
tseaver May 28, 2013
16e45f8
Python 2.5 is still supported.
tseaver May 28, 2013
cd1a95a
Restore 100% coverage.
tseaver May 28, 2013
457d64b
Py3k: print statements.
tseaver May 28, 2013
e058ec9
Drop Python 2.5 suport.
tseaver May 28, 2013
463cb09
Py3: use 'except ... as' syntax.
tseaver May 29, 2013
f81d183
Tidy imports.
tseaver May 29, 2013
7d72ac1
PEP8: Wrap 80+ column lines.
tseaver May 29, 2013
e7d1be0
Unshadow 'test_to_string'.
tseaver May 29, 2013
9fc3e66
Normalize
tseaver May 29, 2013
f8c0ece
Normalize away unicode literals.
tseaver May 29, 2013
517dbd8
Py3: compatible imports.
tseaver May 29, 2013
69cb2b9
Don't use non-ASCII bytes literals.
tseaver May 29, 2013
17880b6
Restore coverage.
tseaver May 29, 2013
3d5d52f
Add a 'b()' utility for forcing encoding to bytes.
tseaver Jun 4, 2013
da9145c
Moar Py3k compat.
tseaver Jun 4, 2013
bb7568f
Restore correct split of urlquoted UTF-8 query strings under Python2.
tseaver Jun 5, 2013
4000723
Run tests under tox on Python 3.2.
tseaver Jun 5, 2013
63db42c
Accomodate hash randomization.
tseaver Jun 5, 2013
1d37881
Avoid shadowing imported 'b' function.
tseaver Jun 5, 2013
1f7134b
Accomodate hash randomization moar.
tseaver Jun 5, 2013
f26d9c0
Run tests under tox on Python 3.3.
tseaver Jun 5, 2013
fb2b824
Silence Py3k unittest nannyisms.
tseaver Jun 5, 2013
b042c22
Note support for Python 3.2 and 3.3.
tseaver Jun 5, 2013
05e2ffb
Remove spurious 'str()' conversion.
tseaver Jun 5, 2013
0406587
Ensure we parse qs as test in Token.from_string.
tseaver Jun 5, 2013
bf62502
Merge branch 'feat-python-3' into py3-redux
rickhanlonii Jul 31, 2015
007ac36
Fix p3k tests broken in merge
rickhanlonii Jul 31, 2015
0104ab1
Added Gitter badge
gitter-badger Aug 2, 2015
8d3774d
Merge pull request #182 from gitter-badger/gitter-badge
rickhanlonii Aug 3, 2015
d7c9e4c
Add classifiers to setup.py
Aug 17, 2015
0dcd088
Merge pull request #188 from CentricWebEstate/feature/classifiers
rickhanlonii Aug 18, 2015
b15f785
Revert "Add Classifiers to Setup.py"
jaitaiwan Aug 18, 2015
e417818
Merge pull request #189 from joestump/revert-188-feature/classifiers
jaitaiwan Aug 19, 2015
fa293a3
Merge pull request #190 from CentricWebEstate/feature/classifiers
jaitaiwan Aug 19, 2015
32f4997
Fix p3k tests
rickhanlonii Sep 8, 2015
aae98a7
Merge remote-tracking branch 'joe/develop' into rh-py3-redux
rickhanlonii Sep 8, 2015
cdda5f5
Use correct test value.
rickhanlonii Sep 8, 2015
1ff5e1d
Merge branch 'py3-redux' of github.com:rickhanlonii/python-oauth2 int…
Sep 12, 2015
ef42e4b
Update for py3k release
Sep 12, 2015
0fddbbe
Minor copy edits
Sep 12, 2015
acdd693
Bump Version
Sep 12, 2015
c9e005f
Merge branch 'release/1.9'
Sep 12, 2015
7d4e3fc
Merge branch 'release/1.9' into develop
Sep 12, 2015
662f659
Merge branch 'master' of github.com:joestump/python-oauth2
Sep 12, 2015
0e500eb
Merge branch 'master' into develop
Sep 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
*.py?
*.egg-info
*.swp
.coverage
coverage.xml
nosetests.xml
.tox
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ language: python
python:
- "2.6"
- "2.7"
- "3.3"
- "3.4"
install: "pip install -r requirements.txt"
script: py.test
Loading