Skip to content

throw error if 'environ' in extra arg. remove extra_orig. #7

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 1 commit into
base: master
Choose a base branch
from
Open

throw error if 'environ' in extra arg. remove extra_orig. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions boddle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ def __init__(self, params={}, path=None, method=None, headers=None, json=None, u

environ = {}
self.extras = extras
self.extra_orig = {}
self.orig_app_reader = bottle.BaseRequest.app

if params is not None:
Expand Down Expand Up @@ -72,21 +71,18 @@ def __enter__(self):
self.orig = bottle.request.environ
bottle.request.environ = self.environ
for k,v in self.extras.items():
if hasattr(bottle.request, k):
self.extra_orig[k] = getattr(bottle.request, k)
if k == 'environ':
raise ValueError('%s cannot be used as an extra argument.' % k)
setattr(bottle.request, k, v)
setattr(bottle.BaseRequest, 'app', True)

def __exit__(self,a,b,c):
bottle.request.environ = self.orig
for k,v in self.extras.items():
if k in self.extra_orig:
setattr(bottle.request, k, self.extra_orig[k])
else:
try:
delattr(bottle.request, k)
except AttributeError:
pass
try:
delattr(bottle.request, k)
except AttributeError:
pass
setattr(bottle.BaseRequest, 'app', self.orig_app_reader)


7 changes: 6 additions & 1 deletion tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,12 @@ def testExtraStuff(self):
with boddle(extra='woot2'):
self.assertEqual(bottle.request.extra, 'woot2')
self.assertFalse(hasattr(bottle.request,'extra'))


def testExtraEnviron(self):
with self.assertRaises(ValueError):
with boddle(environ='bad'):
pass

def testJSON(self):
with boddle(json={'name':'derek'}):
self.assertEqual(bottle.request.json['name'], 'derek')
Expand Down