Add webhelpers2 dependency, use it for most things

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

tailbone/forms/alchemy.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.
 #
@@ -30,7 +30,7 @@ from rattail.core import Object
 
 import formalchemy as fa
 from pyramid.renderers import render
-from webhelpers.html import HTML, tags
+from webhelpers2.html import HTML, tags
 
 from tailbone.db import Session
 

tailbone/forms/renderers/batch.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.
 #
@@ -31,7 +31,7 @@ import stat
 import random
 
 import formalchemy as fa
-from webhelpers.html import tags, HTML
+from webhelpers2.html import tags, HTML
 
 from tailbone.forms.renderers import FileFieldRenderer as BaseFileFieldRenderer
 

tailbone/forms/renderers/common.py

@@ -34,7 +34,7 @@ from rattail.util import pretty_quantity
 import formalchemy as fa
 from formalchemy import fields as fa_fields, helpers as fa_helpers
 from pyramid.renderers import render
-from webhelpers.html import HTML, tags
+from webhelpers2.html import HTML, tags
 
 from tailbone.util import pretty_datetime, raw_datetime
 

tailbone/forms/renderers/custorders.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; -*-
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
@@ -27,7 +27,7 @@ Customer order field renderers
 from __future__ import unicode_literals, absolute_import
 
 import formalchemy as fa
-from webhelpers.html import tags
+from webhelpers2.html import tags
 
 
 class CustomerOrderFieldRenderer(fa.fields.SelectFieldRenderer):

tailbone/forms/renderers/employees.py

@@ -27,7 +27,7 @@ Employee Field Renderers
 from __future__ import unicode_literals, absolute_import
 
 import six
-from webhelpers.html import tags
+from webhelpers2.html import tags
 
 from tailbone.forms.renderers import AutocompleteFieldRenderer
 

tailbone/forms/renderers/people.py

@@ -28,7 +28,7 @@ from __future__ import unicode_literals, absolute_import
 
 import six
 import formalchemy as fa
-from webhelpers.html import tags, HTML
+from webhelpers2.html import tags, HTML
 
 from tailbone.forms.renderers.common import AutocompleteFieldRenderer
 

tailbone/forms/renderers/products.py

@@ -33,7 +33,7 @@ from rattail.db.util import maxlen
 import formalchemy as fa
 from formalchemy import TextFieldRenderer
 from formalchemy.fields import SelectFieldRenderer
-from webhelpers.html import tags, literal
+from webhelpers2.html import tags, literal
 
 from tailbone.forms.renderers.common import AutocompleteFieldRenderer
 from tailbone.util import pretty_datetime

tailbone/forms/renderers/stores.py

@@ -27,7 +27,7 @@ Store Field Renderers
 from __future__ import unicode_literals, absolute_import
 
 from formalchemy.fields import SelectFieldRenderer
-from webhelpers.html import tags
+from webhelpers2.html import tags
 
 
 class StoreFieldRenderer(SelectFieldRenderer):

tailbone/forms/renderers/users.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; -*-
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
@@ -30,7 +30,7 @@ from rattail.db import model
 from rattail.db.auth import has_permission, administrator_role
 
 import formalchemy
-from webhelpers.html import HTML, tags
+from webhelpers2.html import HTML, tags
 
 from tailbone.db import Session
 

tailbone/forms/renderers/vendors.py

@@ -27,7 +27,7 @@ Vendor Field Renderers
 from __future__ import unicode_literals, absolute_import
 
 from formalchemy.fields import SelectFieldRenderer
-from webhelpers.html import tags
+from webhelpers2.html import tags
 
 from tailbone.forms.renderers.common import AutocompleteFieldRenderer
 

tailbone/forms/simpleform.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.
 #
@@ -30,8 +30,7 @@ from rattail.util import prettify
 
 import pyramid_simpleform
 from pyramid_simpleform import renderers
-from webhelpers.html import tags
-from webhelpers.html import HTML
+from webhelpers2.html import tags, HTML
 
 from tailbone.forms import Form