Skip to content

Commit

Permalink
pep8
Browse files Browse the repository at this point in the history
  • Loading branch information
ckwang8128 committed Mar 2, 2017
1 parent f2c4672 commit 7ec23cc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 1 addition & 2 deletions baseplate/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from .integration.wrapped_context import WrappedRequestContext


class BaseplateObserver(object):
"""Interface for an observer that watches Baseplate."""

Expand Down Expand Up @@ -326,7 +327,6 @@ def __enter__(self):
self.start()
return self


def __exit__(self, exc_type, value, traceback):
if exc_type is not None:
self.finish(exc_info=(exc_type, value, traceback))
Expand Down Expand Up @@ -374,4 +374,3 @@ class ServerSpan(Span):
"""
pass

5 changes: 4 additions & 1 deletion baseplate/integration/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@
application frameworks.
"""
from .wrapped_context import WrappedRequestContext
from wrapped_context import WrappedRequestContext
__all__ = [
"WrappedRequestContext",
]
2 changes: 2 additions & 0 deletions baseplate/integration/wrapped_context.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import copy


def merge_two_dicts(x, y):
"""Given two dicts, merge them into a new dict as a shallow copy."""
z = x.copy()
z.update(y)
return z


class WrappedRequestContext(object):
def __init__(self, context, trace=None):
self._context = context
Expand Down

0 comments on commit 7ec23cc

Please sign in to comment.