Add webhelpers2 dependency, use it for most things

still using webhelpers for certain things yet, hopefully can get rid of that soon

tailbone/views/auth.py

@@ -31,7 +31,7 @@ from rattail.db.auth import authenticate_user, set_user_password
 import formencode as fe
 from pyramid.httpexceptions import HTTPForbidden
 from pyramid_simpleform import Form
-from webhelpers.html import tags, literal
+from webhelpers2.html import tags, literal
 
 from tailbone import forms
 from tailbone.db import Session

tailbone/views/batch/core.py

@@ -47,7 +47,7 @@ from pyramid import httpexceptions
 from pyramid.renderers import render_to_response
 from pyramid.response import FileResponse
 from pyramid_simpleform import Form
-from webhelpers.html import HTML, tags
+from webhelpers2.html import HTML, tags
 
 from tailbone import forms, newgrids as grids
 from tailbone.db import Session

tailbone/views/bouncer.py

@@ -1,8 +1,8 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; -*-
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2016 Lance Edgar
+#  Copyright © 2010-2017 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -35,7 +35,7 @@ from rattail.bouncer.config import get_profile_keys
 
 import formalchemy
 from pyramid.response import FileResponse
-from webhelpers.html import literal
+from webhelpers2.html import literal
 
 from tailbone import newgrids as grids
 from tailbone.db import Session

tailbone/views/handheld.py

@@ -34,7 +34,7 @@ from rattail.util import OrderedDict
 
 import formalchemy as fa
 import formencode as fe
-from webhelpers.html import tags
+from webhelpers2.html import tags
 
 from tailbone import forms
 from tailbone.db import Session

tailbone/views/master.py

@@ -39,7 +39,7 @@ from rattail.time import localtime
 import formalchemy as fa
 from pyramid import httpexceptions
 from pyramid.renderers import get_renderer, render_to_response, render
-from webhelpers.html import HTML, tags
+from webhelpers2.html import HTML, tags
 
 from tailbone import forms, newgrids as grids
 from tailbone.views import View

tailbone/views/messages.py

@@ -1,8 +1,8 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; -*-
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2016 Lance Edgar
+#  Copyright © 2010-2017 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -36,7 +36,7 @@ from rattail.time import localtime
 import formalchemy
 from formalchemy.helpers import text_field
 from pyramid import httpexceptions
-from webhelpers.html import tags, HTML
+from webhelpers2.html import tags, HTML
 
 from tailbone import forms
 from tailbone.db import Session

tailbone/views/people.py

@@ -30,7 +30,7 @@ import sqlalchemy as sa
 
 import formalchemy as fa
 from pyramid.httpexceptions import HTTPFound, HTTPNotFound
-from webhelpers.html import HTML, tags
+from webhelpers2.html import HTML, tags
 
 from tailbone import forms
 from tailbone.views import MasterView, AutocompleteView

tailbone/views/products.py

@@ -44,7 +44,7 @@ import wtforms
 import formalchemy as fa
 from pyramid import httpexceptions
 from pyramid.renderers import render_to_response
-from webhelpers.html import tags
+from webhelpers2.html import tags
 
 from tailbone import forms, newgrids as grids
 from tailbone.db import Session

tailbone/views/purchases/core.py

@@ -1,8 +1,8 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; -*-
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2016 Lance Edgar
+#  Copyright © 2010-2017 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -29,7 +29,7 @@ from __future__ import unicode_literals, absolute_import
 from rattail.db import model
 
 import formalchemy as fa
-from webhelpers.html import HTML, tags
+from webhelpers2.html import HTML, tags
 
 from tailbone import forms
 from tailbone.db import Session

tailbone/views/purchasing/receiving.py

@@ -37,7 +37,7 @@ from rattail.util import pretty_quantity
 
 import formalchemy as fa
 import formencode as fe
-from webhelpers.html import tags
+from webhelpers2.html import tags
 
 from tailbone import forms
 from tailbone.views.purchasing import PurchasingBatchView

tailbone/views/roles.py

@@ -33,7 +33,6 @@ from rattail.db.auth import has_permission, administrator_role, guest_role, auth
 
 import formalchemy as fa
 from formalchemy.fields import IntegerFieldRenderer
-from webhelpers.html import HTML, tags
 
 from tailbone import forms, newgrids as grids
 from tailbone.db import Session

tailbone/views/shifts/lib.py

@@ -38,7 +38,7 @@ from rattail.util import pretty_hours, hours_as_decimal
 
 import formencode as fe
 from pyramid_simpleform import Form
-from webhelpers.html import HTML
+from webhelpers2.html import HTML
 
 from tailbone import forms
 from tailbone.db import Session

tailbone/views/tempmon/clients.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; -*-
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
@@ -31,7 +31,7 @@ import subprocess
 from rattail_tempmon.db import model as tempmon
 
 import formalchemy as fa
-from webhelpers.html import HTML, tags
+from webhelpers2.html import HTML, tags
 
 from tailbone.db import TempmonSession
 from tailbone.views.tempmon import MasterView

tailbone/views/tempmon/core.py

@@ -1,8 +1,8 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; -*-
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2016 Lance Edgar
+#  Copyright © 2010-2017 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -27,7 +27,7 @@ Common stuff for tempmon views
 from __future__ import unicode_literals, absolute_import
 
 from formalchemy.fields import SelectFieldRenderer
-from webhelpers.html import tags
+from webhelpers2.html import tags
 
 from tailbone import views
 from tailbone.db import TempmonSession

tailbone/views/users.py

@@ -36,7 +36,7 @@ from rattail.db.auth import guest_role, authenticated_role, set_user_password, h
 import wtforms
 import formalchemy
 from formalchemy.fields import SelectFieldRenderer
-from webhelpers.html import HTML, tags
+from webhelpers2.html import HTML, tags
 
 from tailbone import forms
 from tailbone.db import Session