Cleanup

Author: amol-

devtools/gearbox/quickstart/command.py

@@ -3,7 +3,6 @@
 import re
 import os
 import shutil
-import sys
 import glob
 import importlib.metadata
 import importlib.util
@@ -12,8 +11,6 @@
 from gearbox.template import GearBoxTemplate
 from gearbox.command import Command
 
-PY3 = sys.version_info[0] == 3
-PYVERSION = sys.version_info[:2]
 beginning_letter = re.compile(r"^[^a-z]*")
 valid_only = re.compile(r"[^a-z0-9_]")
 
@@ -37,15 +34,6 @@ def pre(self, command, output_dir, vars):
         elif vars['kajiki']:
             vars['template_engine'] = 'kajiki'
 
-        template_engine = vars.setdefault('template_engine', 'kajiki')
-
-        if template_engine == 'mako':
-            # Support a Babel extractor default for Mako
-            vars['babel_templates_extractor'] = ("('templates/**.mako',"
-                " 'mako', None),\n%s#%s") % (' ' * 4, ' ' * 8)
-        else:
-            vars['babel_templates_extractor'] = ''
-
         if vars['migrations'] == 'True':
             vars['egg_plugins'].append('tg.devtools')
 
@@ -193,19 +181,10 @@ def take_action(self, opts):
         #    if value is True:
         #        template_vars[key] = 'True'
 
-        template_vars['PY3'] = PY3
-        template_vars['PYVERSION'] = PYVERSION
         QuickstartTemplate().run(os.path.join(quickstart_path, 'template'),
                                  opts.name, template_vars)
 
         os.chdir(opts.name)
-
-        try:
-            sys.argv = ['setup.py', 'egg_info']
-            imp.load_module('setup', *imp.find_module('setup', ['.']))
-        except:
-            print('Unable to run egg_info for newly created package! Continuing anyway...')
-
         print("")
 
         # dirty hack to allow "empty" dirs

devtools/gearbox/quickstart/template/+package+/config/app_cfg.py_tmpl

@@ -41,15 +41,13 @@ rendering_config['jinja_extensions'] = []
 {{endif}}
 {{if kajiki}}
 rendering_config['renderers'].append('kajiki')
-# Change this in setup.py too for i18n to work.
+# Change this in pyproject.toml too for i18n to work.
 rendering_config['templating.kajiki.strip_text'] = False
 {{endif}}
 {{if genshi}}
 rendering_config['renderers'].append('genshi')
-{{if PYVERSION >= (3, 4)}}
 rendering_config['templating.genshi.name_constant_patch'] = True
 {{endif}}
-{{endif}}
 base_config.update_blueprint(rendering_config)
 
 # Configure Sessions, store data as JSON to avoid pickle security issues

devtools/gearbox/quickstart/template/+package+/model/auth.py_tmpl

@@ -135,13 +135,6 @@ class User(DeclarativeBase):
         hash = hash.hexdigest()
 
         password = salt + hash
-
-        {{if PY3 == False}}
-        # Make sure the hashed password is a unicode object at the end of the
-        # process because SQLAlchemy _wants_ unicode objects for Unicode cols
-        password = password.decode('utf-8')
-        {{endif}}
-
         return password
 
     def _set_password(self, password):
@@ -264,13 +257,6 @@ class User(MappedClass):
             hash = hash.hexdigest()
 
             password = salt + hash
-
-            {{if PY3 == False}}
-            # Make sure the hashed password is a unicode object at the end of the
-            # process because SQLAlchemy _wants_ unicode objects for Unicode cols
-            password = password.decode('utf-8')
-            {{endif}}
-
             return password
 
         def __set__(self, instance, value):

devtools/gearbox/quickstart/template/setup.cfg_tmpl

@@ -1,4 +1,6 @@
-# Babel configuration
+# Babel configuration, 
+# currently this are only supporterd in babel.cfg or setup.cfg
+
 [compile_catalog]
 domain = {{package}}
 directory = {{package}}/i18n