[allura] 02/09: [#8286] remove deps on WebError and WebFlash

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch db/8286
in repository https://gitbox.apache.org/repos/asf/allura.git

commit af60f99cab5e6a14226e0edff50133dddf59d1fb
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Fri May 17 14:50:09 2019 -0400

    [#8286] remove deps on WebError and WebFlash
---
 Allura/allura/config/middleware.py            |  2 +-
 Allura/allura/controllers/controller.template | 37 ---------------------------
 requirements.txt                              |  2 --
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/Allura/allura/config/middleware.py b/Allura/allura/config/middleware.py
index 7775d6e..b97353e 100644
--- a/Allura/allura/config/middleware.py
+++ b/Allura/allura/config/middleware.py
@@ -29,7 +29,7 @@ from tg.support.registry import RegistryManager
 from routes.middleware import RoutesMiddleware
 from tg.support.middlewares import StatusCodeRedirect
 from beaker.middleware import SessionMiddleware
-from weberror.errormiddleware import ErrorMiddleware
+from paste.exceptions.errormiddleware import ErrorMiddleware
 
 import activitystream
 import ew
diff --git a/Allura/allura/controllers/controller.template b/Allura/allura/controllers/controller.template
deleted file mode 100644
index f565369..0000000
--- a/Allura/allura/controllers/controller.template
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-"""Sample controller module"""
-
-# turbogears imports
-from tg import expose
-#from tg import redirect, validate, flash
-
-# third party imports
-#from pylons.i18n import ugettext as _
-#from repoze.what import predicates
-
-# project specific imports
-from allura.lib.base import BaseController
-#from allura.model import DBSession, metadata
-
-
-class SampleController(BaseController):
-    
-    @expose('allura.templates.index')
-    def index(self):
-        return dict(page='index')
diff --git a/requirements.txt b/requirements.txt
index eb19aeb..e89d209 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -75,7 +75,6 @@ repoze.lru==0.7
 simplejson==3.16.0
 Tempita==0.5.1
 Routes==2.4.1
-WebFlash==0.1a9
 WebHelpers==1.3
 
 # git deps
@@ -95,7 +94,6 @@ pylint==1.4.4
 astroid==1.3.8
 logilab-common==1.0.2
 q==2.3
-WebError==0.10.3
 -e git://github.com/brondsem/sphinx-argparse.git#egg=sphinx-argparse   # pending merge requests
 sphinx-rtd-theme==0.1.6
 sphinxcontrib-programoutput==0.8