diff options
| author |  Gareth Coles <[email protected]> | 2018-02-18 11:25:59 +0000 |
|---|---|---|
| committer | Gareth Coles <[email protected]> | 2018-02-18 11:25:59 +0000 |
| commit | c39b8d566508a44e0ef2f26b17ce60ac7ccb853a (patch) | |
| tree | 373a0252d1f489bc69c0f5f0babd34e0ce5e59cc /pysite | |
| parent | Merge remote-tracking branch 'origin/master' (diff) | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# pysite/views/ws/echo.py
Diffstat (limited to 'pysite')
| -rw-r--r-- | pysite/route_manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pysite/route_manager.py b/pysite/route_manager.py index 2b6669e9..105a8f86 100644 --- a/pysite/route_manager.py +++ b/pysite/route_manager.py @@ -84,8 +84,8 @@ class RouteManager: cls is not APIView and cls is not WS and ( - BaseView in cls.__mro__ or - WS in cls.__mro__ + BaseView in cls.__mro__ or + WS in cls.__mro__ ) ): cls.setup(self, blueprint) |