Skip to content

Merge query server from kxepal/viewserver #276

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

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Merge query server from kxepal/viewserver #276

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
468560b
[server] import `server` package from kxepal/couchdb-python@9145545
iblislin Mar 2, 2016
9cbcca1
[server] apply pep8 coding style
iblislin Mar 3, 2016
f61651a
[server] Increase py3 compatibility
iblislin Mar 3, 2016
9816be5
[server] import `tests/server` package from kxepal/couchdb-python@914…
iblislin Mar 3, 2016
e63718b
[server] apply pep8 coding style to testing code
iblislin Mar 3, 2016
5518b26
[server] Improve py3 compatibility for testing code
iblislin Mar 3, 2016
80c1fac
[server] `logging.warn` is deprecated
iblislin Mar 7, 2016
29bcd42
[server] Add testing suite to tests/__main__
iblislin Mar 12, 2016
ec61a5a
[tests/server] Fix usage of assertRaises
iblislin Mar 12, 2016
8825c6d
[tests/server] Fix `test_fail_for_invalid_b64egg_string`
iblislin Mar 12, 2016
41c179e
[server] To guarantee the order of MimeProvider.provides
iblislin Mar 12, 2016
33cda72
[tests/server] Fix byte string in py3
iblislin Mar 12, 2016
93ab494
[server] py3 require utf-8 cooked bytes string for builtin `compile`
iblislin Mar 12, 2016
49b0e04
[tests/server] Avoiding unordered output of json in comparison
iblislin Mar 12, 2016
dfccc72
[server] Remove side effect in `render.apply_context`
iblislin Mar 12, 2016
e425761
[server] Add backport dependency `ordereddict` for py26
iblislin Mar 12, 2016
36e9c25
[server] merge view.py from kxepal/couchdb-python@9145545
iblislin Mar 15, 2016
7945d36
[server] mv couchdb/view.py to couchdb/server/__main__.py
iblislin Mar 15, 2016
a0962ac
[server] remove legacy support for `pkgutil`
iblislin Mar 15, 2016
669cdbc
[server] bugfix for maxsplit
iblislin Mar 15, 2016
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
Prev Previous commit
Next Next commit
[tests/server] Fix test_fail_for_invalid_b64egg_string 
In py3, the `base64.b64decode` will raise `binascii.Error`.
In py2, it will be `TypeError`
  • Loading branch information
@iblislin
iblislin committed Mar 12, 2016
commit 8825c6d93f0aea570a1801952a5a94082d0fcb66
6 changes: 5 additions & 1 deletion couchdb/tests/server/compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
#
import binascii
import types
import unittest

Expand Down Expand Up @@ -218,7 +219,10 @@ def test_fail_for_invalid_egg(self):

def test_fail_for_invalid_b64egg_string(self):
egg = 'UEsDBBQAAAAIAKx1qD6TBtcyAwAAAAEAAAAdAAAARUdHLUlORk8vZGVwZW5kZW'
self.assertRaises(TypeError, compiler.import_b64egg, egg)
# python3 will raise ``binascii.Error``
# https://docs.python.org/3/library/base64.html#base64.b64decode
self.assertRaises((TypeError, binascii.Error),
compiler.import_b64egg, egg)

def test_fail_for_no_setuptools_or_pkgutils(self):
egg = 'UEsDBBQAAAAIAKx1qD6TBtcyAwAAAAEAAAAdAAAARUdHLUlORk8vZGVwZW5kZW=='
Expand Down