You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2020/02/10 22:44:42 UTC

[allura] 11/41: [#8349] python-modernize -n -w --no-diffs -f dict_six .

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

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

commit 264fb1a0a088881c2d0fccaf74f9c559eeb359c1
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Mon Feb 10 13:28:29 2020 -0500

    [#8349] python-modernize -n -w --no-diffs -f dict_six .
---
 Allura/allura/app.py                               |  5 ++--
 Allura/allura/command/base.py                      |  2 +-
 Allura/allura/command/create_trove_categories.py   |  3 +-
 Allura/allura/command/show_models.py               | 23 ++++++++--------
 Allura/allura/controllers/auth.py                  |  9 +++---
 Allura/allura/controllers/discuss.py               |  3 +-
 Allura/allura/controllers/project.py               |  2 +-
 Allura/allura/controllers/repository.py            |  3 +-
 Allura/allura/controllers/rest.py                  |  3 +-
 Allura/allura/controllers/site_admin.py            |  3 +-
 Allura/allura/controllers/trovecategories.py       |  5 ++--
 Allura/allura/ext/admin/admin_main.py              | 11 ++++----
 Allura/allura/lib/app_globals.py                   |  2 +-
 Allura/allura/lib/decorators.py                    |  2 +-
 Allura/allura/lib/helpers.py                       | 24 ++++++++--------
 Allura/allura/lib/import_api.py                    |  2 +-
 Allura/allura/lib/macro.py                         |  2 +-
 Allura/allura/lib/multifactor.py                   |  3 +-
 Allura/allura/lib/patches.py                       |  3 +-
 Allura/allura/lib/plugin.py                        |  4 +--
 Allura/allura/lib/search.py                        |  4 +--
 Allura/allura/lib/security.py                      | 10 +++----
 Allura/allura/lib/solr.py                          |  2 +-
 Allura/allura/lib/utils.py                         |  2 +-
 Allura/allura/lib/validators.py                    |  3 +-
 Allura/allura/lib/widgets/discuss.py               |  7 +++--
 Allura/allura/lib/widgets/form_fields.py           |  7 +++--
 Allura/allura/lib/widgets/forms.py                 |  5 ++--
 Allura/allura/lib/widgets/user_profile.py          |  2 +-
 Allura/allura/model/artifact.py                    |  3 +-
 Allura/allura/model/index.py                       |  5 ++--
 Allura/allura/model/notification.py                |  3 +-
 Allura/allura/model/project.py                     | 23 ++++++++--------
 Allura/allura/model/repo_refresh.py                |  9 +++---
 Allura/allura/model/repository.py                  | 20 +++++++-------
 Allura/allura/model/session.py                     |  3 +-
 Allura/allura/scripts/trac_export.py               |  2 +-
 Allura/allura/tests/functional/test_auth.py        |  5 ++--
 Allura/allura/tests/functional/test_rest.py        |  6 ++--
 Allura/allura/tests/functional/test_site_admin.py  |  3 +-
 Allura/allura/tests/model/test_auth.py             |  6 ++--
 Allura/allura/tests/model/test_notification.py     |  2 +-
 Allura/allura/tests/model/test_repo.py             |  2 +-
 Allura/allura/tests/test_helpers.py                |  4 +--
 .../allura/tests/unit/test_ldap_auth_provider.py   |  5 ++--
 Allura/allura/webhooks.py                          |  2 +-
 Allura/allura/websetup/bootstrap.py                |  3 +-
 AlluraTest/alluratest/controller.py                |  3 +-
 AlluraTest/alluratest/validation.py                |  6 ++--
 ForgeBlog/forgeblog/main.py                        |  2 +-
 ForgeBlog/forgeblog/model/blog.py                  |  3 +-
 ForgeDiscussion/forgediscussion/import_support.py  |  9 +++---
 ForgeSVN/forgesvn/tests/model/test_repository.py   |  3 +-
 ForgeTracker/forgetracker/import_support.py        |  9 +++---
 ForgeTracker/forgetracker/model/ticket.py          | 32 +++++++++++-----------
 ForgeTracker/forgetracker/search.py                |  3 +-
 .../forgetracker/tests/functional/test_root.py     | 11 ++++----
 ForgeTracker/forgetracker/tests/test_app.py        |  2 +-
 .../forgetracker/tests/unit/test_ticket_model.py   |  2 +-
 ForgeTracker/forgetracker/tracker_main.py          |  3 +-
 ForgeTracker/forgetracker/widgets/ticket_search.py |  3 +-
 .../forgeuserstats/controllers/userstats.py        |  2 +-
 ForgeWiki/forgewiki/model/wiki.py                  |  2 +-
 fuse/accessfs.py                                   |  3 +-
 scripts/perf/benchmark-scm.py                      |  4 +--
 scripts/project-import.py                          |  5 ++--
 scripts/teamforge-import.py                        |  4 +--
 scripts/trac_import.py                             |  3 +-
 68 files changed, 207 insertions(+), 169 deletions(-)

diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 26b21f3..62ebca6 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -49,6 +49,7 @@ from allura.lib.decorators import require_post, memoize
 from allura.lib.utils import permanent_redirect, ConfigProxy
 from allura import model as M
 from allura.tasks import index_tasks
+import six
 
 log = logging.getLogger(__name__)
 
@@ -614,7 +615,7 @@ class Application(object):
         :return: a list of :class:`WebhookSender <allura.webhooks.WebhookSender>`
         """
         tool_name = self.config.tool_name.lower()
-        webhooks = [w for w in g.entry_points['webhooks'].itervalues()
+        webhooks = [w for w in six.itervalues(g.entry_points['webhooks'])
                     if tool_name in w.triggered_by]
         return webhooks
 
@@ -666,7 +667,7 @@ class Application(object):
     def admin_menu_delete_button(self):
         """Returns button for deleting an app if app can be deleted"""
         anchored_tools = self.project.neighborhood.get_anchored_tools()
-        anchored = self.tool_label.lower() in anchored_tools.keys()
+        anchored = self.tool_label.lower() in list(anchored_tools.keys())
         if self.uninstallable and not anchored:
             return SitemapEntry(
                 label='Delete Everything',
diff --git a/Allura/allura/command/base.py b/Allura/allura/command/base.py
index f7fd693..ac4c798 100644
--- a/Allura/allura/command/base.py
+++ b/Allura/allura/command/base.py
@@ -112,7 +112,7 @@ class Command(command.Command):
             # Probably being called from another script (websetup, perhaps?)
             log = logging.getLogger('allura.command')
             conf = tg.config
-        self.tools = tg.app_globals.entry_points['tool'].values()
+        self.tools = list(tg.app_globals.entry_points['tool'].values())
         for ep in h.iter_entry_points('allura.command_init'):
             log.info('Running command_init for %s', ep.name)
             ep.load()(conf)
diff --git a/Allura/allura/command/create_trove_categories.py b/Allura/allura/command/create_trove_categories.py
index aa3bb99..bf9ddc2 100644
--- a/Allura/allura/command/create_trove_categories.py
+++ b/Allura/allura/command/create_trove_categories.py
@@ -27,6 +27,7 @@ from mock import patch, Mock
 from . import base
 
 from allura import model as M
+import six
 
 log = logging.getLogger(__name__)
 
@@ -64,7 +65,7 @@ class CreateTroveCategoriesCommand(base.Command):
             sys.exit("Couldn't find TroveCategory with trove_cat_id=%s" %
                      trove_cat_id)
         for t in ts:
-            for k, v in attr_dict.iteritems():
+            for k, v in six.iteritems(attr_dict):
                 setattr(t, k, v)
 
     # patching to avoid a *lot* of event hooks firing, and taking a long long time
diff --git a/Allura/allura/command/show_models.py b/Allura/allura/command/show_models.py
index 50c5114..f38851d 100644
--- a/Allura/allura/command/show_models.py
+++ b/Allura/allura/command/show_models.py
@@ -35,6 +35,7 @@ from allura.lib.exceptions import CompoundError
 from allura.lib import helpers as h
 from allura.lib import utils
 from . import base
+import six
 
 
 class ShowModelsCommand(base.Command):
@@ -237,14 +238,14 @@ class EnsureIndexCommand(base.Command):
                 idx = project_indexes[cname]
             idx.extend(mgr.indexes)
         base.log.info('Updating indexes for main DB')
-        for odm_session, db_indexes in main_indexes.iteritems():
+        for odm_session, db_indexes in six.iteritems(main_indexes):
             db = odm_session.impl.db
-            for name, indexes in db_indexes.iteritems():
+            for name, indexes in six.iteritems(db_indexes):
                 self._update_indexes(db[name], indexes)
         base.log.info('Updating indexes for project DB')
         db = M.project_doc_session.db
         base.log.info('... DB: %s', db)
-        for name, indexes in project_indexes.iteritems():
+        for name, indexes in six.iteritems(project_indexes):
             self._update_indexes(db[name], indexes)
         base.log.info('Done updating indexes')
 
@@ -263,7 +264,7 @@ class EnsureIndexCommand(base.Command):
         unique_flag_drop = {}
         unique_flag_add = {}
         try:
-            existing_indexes = collection.index_information().iteritems()
+            existing_indexes = six.iteritems(collection.index_information())
         except OperationFailure:
             # exception is raised if db or collection doesn't exist yet
             existing_indexes = {}
@@ -282,13 +283,13 @@ class EnsureIndexCommand(base.Command):
                 else:
                     prev_indexes[iname] = keys
 
-        for iname, keys in unique_flag_drop.iteritems():
+        for iname, keys in six.iteritems(unique_flag_drop):
             self._recreate_index(collection, iname, list(keys), unique=False)
-        for iname, keys in unique_flag_add.iteritems():
+        for iname, keys in six.iteritems(unique_flag_add):
             self._recreate_index(collection, iname, list(keys), unique=True)
 
         # Ensure all indexes
-        for keys, idx in uindexes.iteritems():
+        for keys, idx in six.iteritems(uindexes):
             base.log.info('...... ensure %s:%s', collection.name, idx)
             while True:
                 try:
@@ -303,11 +304,11 @@ class EnsureIndexCommand(base.Command):
                 except DuplicateKeyError as err:
                     base.log.info('Found dupe key(%s), eliminating dupes', err)
                     self._remove_dupes(collection, idx.index_spec)
-        for keys, idx in indexes.iteritems():
+        for keys, idx in six.iteritems(indexes):
             base.log.info('...... ensure %s:%s', collection.name, idx)
             collection.ensure_index(idx.index_spec, background=True, **idx.index_options)
         # Drop obsolete indexes
-        for iname, keys in prev_indexes.iteritems():
+        for iname, keys in six.iteritems(prev_indexes):
             if keys not in indexes:
                 if self.options.clean:
                     base.log.info('...... drop index %s:%s', collection.name, iname)
@@ -315,7 +316,7 @@ class EnsureIndexCommand(base.Command):
                 else:
                     base.log.info('...... potentially unneeded index, could be removed by running with --clean %s:%s',
                                   collection.name, iname)
-        for iname, keys in prev_uindexes.iteritems():
+        for iname, keys in six.iteritems(prev_uindexes):
             if keys not in uindexes:
                 if self.options.clean:
                     base.log.info('...... drop index %s:%s', collection.name, iname)
@@ -359,7 +360,7 @@ class EnsureIndexCommand(base.Command):
 
 def build_model_inheritance_graph():
     graph = dict((m.mapped_class, ([], [])) for m in Mapper.all_mappers())
-    for cls, (parents, children) in graph.iteritems():
+    for cls, (parents, children) in six.iteritems(graph):
         for b in cls.__bases__:
             if b not in graph:
                 continue
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 3ec037e..44f17d7 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -57,6 +57,7 @@ from allura.lib.multifactor import TotpService, RecoveryCodeService
 from allura.lib import utils
 from allura.controllers import BaseController
 from allura.tasks.mail_tasks import send_system_mail_to_user
+import six
 
 log = logging.getLogger(__name__)
 
@@ -649,7 +650,7 @@ class PreferencesController(BaseController):
             c.user.set_pref('display_name', preferences['display_name'])
             if old != preferences['display_name']:
                 h.auditlog_user('Display Name changed %s => %s', old, preferences['display_name'])
-            for k, v in preferences.iteritems():
+            for k, v in six.iteritems(preferences):
                 if k == 'results_per_page':
                     v = int(v)
                 c.user.set_pref(k, v)
@@ -1165,14 +1166,14 @@ class SubscriptionsController(BaseController):
 
         # Dictionary containing all tools (subscribed and un-subscribed).
         my_tools = M.AppConfig.query.find(dict(
-            project_id={'$in': my_projects.keys()}))
+            project_id={'$in': list(my_projects.keys())}))
 
         # Dictionary containing all the currently subscribed tools for a given user.
         my_tools_subscriptions = dict(
             (mb.app_config_id, mb) for mb in M.Mailbox.query.find(dict(
                 user_id=c.user._id,
-                project_id={'$in': projects.keys()},
-                app_config_id={'$in': app_index.keys()},
+                project_id={'$in': list(projects.keys())},
+                app_config_id={'$in': list(app_index.keys())},
                 artifact_index_id=None)))
 
         # Add the remaining tools that are eligible for subscription.
diff --git a/Allura/allura/controllers/discuss.py b/Allura/allura/controllers/discuss.py
index f918538..f2ac57b 100644
--- a/Allura/allura/controllers/discuss.py
+++ b/Allura/allura/controllers/discuss.py
@@ -48,6 +48,7 @@ from allura.lib.widgets import form_fields as ffw
 from allura.model.auth import User
 from .attachments import AttachmentsController, AttachmentController
 from .feed import FeedArgs, FeedController
+import six
 
 log = logging.getLogger(__name__)
 
@@ -319,7 +320,7 @@ class PostController(BaseController):
             post_fields = self.W.edit_post.to_python(kw, None)  # could raise Invalid, but doesn't seem like it ever does
             file_info = post_fields.pop('file_info', None)
             self.post.add_multiple_attachments(file_info)
-            for k, v in post_fields.iteritems():
+            for k, v in six.iteritems(post_fields):
                 try:
                     setattr(self.post, k, v)
                 except AttributeError:
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 44cf619..d061315 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -242,7 +242,7 @@ class NeighborhoodController(object):
             anchored_tools = neighborhood.get_anchored_tools()
             install_params = []
             for i, tool in enumerate(tools):
-                if (tool.lower() not in anchored_tools.keys()) and (c.project.app_instance(tool) is None):
+                if (tool.lower() not in list(anchored_tools.keys())) and (c.project.app_instance(tool) is None):
                     install_params.append(dict(ep_name=tool, ordinal=i + offset))
             c.project.install_apps(install_params)
         redirect(c.project.script_name + 'admin/?first-visit')
diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py
index 3c9d191..1465b12 100644
--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -58,6 +58,7 @@ from allura.controllers.base import DispatchIndex
 from allura.controllers.rest import AppRestControllerMixin
 from allura.controllers.feed import FeedController, FeedArgs
 from .base import BaseController
+import six
 
 log = logging.getLogger(__name__)
 
@@ -270,7 +271,7 @@ class RepoRootController(BaseController, FeedController):
         parents = {}
         children = defaultdict(list)
         dates = {}
-        for row, (oid, ci) in enumerate(commits_by_id.iteritems()):
+        for row, (oid, ci) in enumerate(six.iteritems(commits_by_id)):
             parents[oid] = list(ci.parent_ids)
             dates[oid] = ci.committed.date
             for p_oid in ci.parent_ids:
diff --git a/Allura/allura/controllers/rest.py b/Allura/allura/controllers/rest.py
index 7977432..f488595 100644
--- a/Allura/allura/controllers/rest.py
+++ b/Allura/allura/controllers/rest.py
@@ -40,6 +40,7 @@ from allura.lib import plugin
 from allura.lib.exceptions import Invalid
 from allura.lib.decorators import require_post
 from allura.lib.security import has_access
+import six
 
 log = logging.getLogger(__name__)
 
@@ -84,7 +85,7 @@ class RestController(object):
         """
         summary = dict()
         stats = dict()
-        for stat, provider in g.entry_points['site_stats'].iteritems():
+        for stat, provider in six.iteritems(g.entry_points['site_stats']):
             stats[stat] = provider()
         if stats:
             summary['site_stats'] = stats
diff --git a/Allura/allura/controllers/site_admin.py b/Allura/allura/controllers/site_admin.py
index 96399b9..75922a4 100644
--- a/Allura/allura/controllers/site_admin.py
+++ b/Allura/allura/controllers/site_admin.py
@@ -51,6 +51,7 @@ import allura
 
 from six.moves.urllib.parse import urlparse
 from webhelpers import paginate
+import six
 
 
 log = logging.getLogger(__name__)
@@ -286,7 +287,7 @@ class SiteAdminController(object):
         def convert_fields(obj):
             # throw the type away (e.g. '_s' from 'url_s')
             result = {}
-            for k,val in obj.iteritems():
+            for k,val in six.iteritems(obj):
                 name = k.rsplit('_', 1)
                 if len(name) == 2:
                     name = name[0]
diff --git a/Allura/allura/controllers/trovecategories.py b/Allura/allura/controllers/trovecategories.py
index d793147..e52bcdb 100644
--- a/Allura/allura/controllers/trovecategories.py
+++ b/Allura/allura/controllers/trovecategories.py
@@ -33,6 +33,7 @@ from allura.lib.security import require_authenticated, require_site_admin
 from allura.lib.widgets import forms
 from allura.lib.plugin import SiteAdminExtension
 from allura.app import SitemapEntry
+import six
 
 
 class F(object):
@@ -100,7 +101,7 @@ class TroveCategoryController(BaseController):
             (self.generate_category(child) for child in category.subcategories)
         }
 
-        return category.fullname, OrderedDict(sorted(children.iteritems()))
+        return category.fullname, OrderedDict(sorted(six.iteritems(children)))
 
     @without_trailing_slash
     @expose('jinja:allura:templates/browse_trove_categories.html')
@@ -111,7 +112,7 @@ class TroveCategoryController(BaseController):
             for (key, value) in
             (self.generate_category(child) for child in parent_categories)
         }
-        return dict(tree=OrderedDict(sorted(tree.iteritems())))
+        return dict(tree=OrderedDict(sorted(six.iteritems(tree))))
 
     @classmethod
     def _create(cls, name, upper_id, shortname):
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index 631c415..a9fedc4 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -53,6 +53,7 @@ from allura.tasks import export_tasks
 from allura.lib.widgets.project_list import ProjectScreenshots
 
 from . import widgets as aw
+import six
 
 
 log = logging.getLogger(__name__)
@@ -103,7 +104,7 @@ class AdminApp(Application):
     @staticmethod
     def installable_tools_for(project):
         tools = []
-        for name, App in g.entry_points['tool'].iteritems():
+        for name, App in six.iteritems(g.entry_points['tool']):
             cfg = M.AppConfig(project_id=project._id, tool_name=name)
             app = App(project, cfg)
             if app.installable:
@@ -249,7 +250,7 @@ class ProjectAdminController(BaseController):
         first_troves = aslist(config.get('trovecategories.admin.order', 'topic,license,os'), ',')
         base_troves = [
             base_troves_by_name.pop(t) for t in first_troves
-        ] + sorted(base_troves_by_name.values(), key=attrgetter('fullname'))
+        ] + sorted(list(base_troves_by_name.values()), key=attrgetter('fullname'))
 
         trove_recommendations = {}
         for trove in base_troves:
@@ -613,7 +614,7 @@ class ProjectAdminController(BaseController):
                 App = g.entry_points['tool'][ep_name]
                 # pass only options which app expects
                 config_on_install = {
-                    k: v for (k, v) in kw.iteritems()
+                    k: v for (k, v) in six.iteritems(kw)
                     if k in [o.name for o in App.options_on_install()]
                 }
                 new_app = c.project.install_app(
@@ -705,7 +706,7 @@ class ProjectAdminRestController(BaseController):
         if not kw:
             raise exc.HTTPBadRequest('Expected kw params in the form of "ordinal: mount_point"')
         try:
-            sorted_tools = sorted(kw.items(), key=lambda x: int(x[0]))
+            sorted_tools = sorted(list(kw.items()), key=lambda x: int(x[0]))
         except ValueError:
             raise exc.HTTPBadRequest('Invalid kw: expected "ordinal: mount_point"')
 
@@ -1004,7 +1005,7 @@ class PermissionsController(BaseController):
             role_ids = map(ObjectId, group_ids + new_group_ids)
             permissions[perm] = role_ids
         c.project.acl = []
-        for perm, role_ids in permissions.iteritems():
+        for perm, role_ids in six.iteritems(permissions):
             role_names = lambda ids: ','.join(sorted(
                 pr.name for pr in M.ProjectRole.query.find(dict(_id={'$in': ids}))))
             old_role_ids = old_permissions.get(perm, [])
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index f809a60..577c261 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -299,7 +299,7 @@ class Globals(object):
 
         # Set listeners to update stats
         statslisteners = []
-        for name, ep in self.entry_points['stats'].iteritems():
+        for name, ep in six.iteritems(self.entry_points['stats']):
             statslisteners.append(ep())
         self.statsUpdater = PostEvent(statslisteners)
 
diff --git a/Allura/allura/lib/decorators.py b/Allura/allura/lib/decorators.py
index 3ce0f18..6a33304 100644
--- a/Allura/allura/lib/decorators.py
+++ b/Allura/allura/lib/decorators.py
@@ -161,7 +161,7 @@ def memoize(func, instance, args, kwargs):
         # decorating a method
         dic = getattr_(instance, "_memoize_dic__{}".format(func.__name__), dict)
 
-    cache_key = (args, frozenset(kwargs.items()))
+    cache_key = (args, frozenset(list(kwargs.items())))
     if cache_key in dic:
         return dic[cache_key]
     else:
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index 3812707..3f0b950 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -280,7 +280,7 @@ def push_config(obj, **kw):
 
     saved_attrs = {}
     new_attrs = []
-    for k, v in kw.iteritems():
+    for k, v in six.iteritems(kw):
         try:
             saved_attrs[k] = getattr(obj, k)
         except AttributeError:
@@ -289,7 +289,7 @@ def push_config(obj, **kw):
     try:
         yield obj
     finally:
-        for k, v in saved_attrs.iteritems():
+        for k, v in six.iteritems(saved_attrs):
             setattr(obj, k, v)
         for k in new_attrs:
             delattr(obj, k)
@@ -390,7 +390,7 @@ def encode_keys(d):
     a valid kwargs argument'''
     return dict(
         (k.encode('utf-8'), v)
-        for k, v in d.iteritems())
+        for k, v in six.iteritems(d))
 
 
 def vardec(fun):
@@ -422,7 +422,7 @@ def convert_bools(conf, prefix=''):
 
     return {
         k: (convert_value(v) if k.startswith(prefix) else v)
-        for k, v in conf.iteritems()
+        for k, v in six.iteritems(conf)
     }
 
 
@@ -547,7 +547,7 @@ def gen_message_id(_id=None):
 class ProxiedAttrMeta(type):
 
     def __init__(cls, name, bases, dct):
-        for v in dct.itervalues():
+        for v in six.itervalues(dct):
             if isinstance(v, attrproxy):
                 v.cls = cls
 
@@ -611,7 +611,7 @@ class fixed_attrs_proxy(proxy):
     """
     def __init__(self, obj, **kw):
         self._obj = obj
-        for k, v in kw.iteritems():
+        for k, v in six.iteritems(kw):
             setattr(self, k, v)
 
 
@@ -619,7 +619,7 @@ class fixed_attrs_proxy(proxy):
 def json_validation_error(controller, **kwargs):
     exc = request.validation['exception']
     result = dict(status='Validation Error',
-                  errors={fld: str(err) for fld, err in exc.error_dict.iteritems()},
+                  errors={fld: str(err) for fld, err in six.iteritems(exc.error_dict)},
                   value=exc.value,
                   params=kwargs)
     response.status = 400
@@ -647,7 +647,7 @@ def config_with_prefix(d, prefix):
     with the prefix stripped
     '''
     plen = len(prefix)
-    return dict((k[plen:], v) for k, v in d.iteritems()
+    return dict((k[plen:], v) for k, v in six.iteritems(d)
                 if k.startswith(prefix))
 
 
@@ -908,7 +908,7 @@ def ming_config(**conf):
         yield
     finally:
         Session._datastores = datastores
-        for name, session in Session._registry.iteritems():
+        for name, session in six.iteritems(Session._registry):
             session.bind = datastores.get(name, None)
             session._name = name
 
@@ -1071,7 +1071,7 @@ def iter_entry_points(group, *a, **kw):
         by_name = defaultdict(list)
         for ep in entry_points:
             by_name[ep.name].append(ep)
-        for name, eps in by_name.iteritems():
+        for name, eps in six.iteritems(by_name):
             ep_count = len(eps)
             if ep_count == 1:
                 yield eps[0]
@@ -1080,8 +1080,8 @@ def iter_entry_points(group, *a, **kw):
 
     def subclass(entry_points):
         loaded = dict((ep, ep.load()) for ep in entry_points)
-        for ep, cls in loaded.iteritems():
-            others = loaded.values()[:]
+        for ep, cls in six.iteritems(loaded):
+            others = list(loaded.values())[:]
             others.remove(cls)
             if all([issubclass(cls, other) for other in others]):
                 return ep
diff --git a/Allura/allura/lib/import_api.py b/Allura/allura/lib/import_api.py
index 7a8a6bd..257f8c8 100644
--- a/Allura/allura/lib/import_api.py
+++ b/Allura/allura/lib/import_api.py
@@ -46,7 +46,7 @@ class AlluraImportApiClient(object):
         if self.verbose:
             log.info("Import API URL: %s", url)
 
-        params = self.sign(six.moves.urllib.parse.urlparse(url).path, params.items())
+        params = self.sign(six.moves.urllib.parse.urlparse(url).path, list(params.items()))
 
         while True:
             try:
diff --git a/Allura/allura/lib/macro.py b/Allura/allura/lib/macro.py
index c8dc885..e348bad 100644
--- a/Allura/allura/lib/macro.py
+++ b/Allura/allura/lib/macro.py
@@ -407,7 +407,7 @@ def include(ref=None, repo=None, **kw):
 
 @macro()
 def img(src=None, **kw):
-    attrs = ('%s="%s"' % t for t in kw.iteritems())
+    attrs = ('%s="%s"' % t for t in six.iteritems(kw))
     included = request.environ.setdefault('allura.macro.att_embedded', set())
     included.add(src)
     if '://' in src:
diff --git a/Allura/allura/lib/multifactor.py b/Allura/allura/lib/multifactor.py
index c21b197..b756930 100644
--- a/Allura/allura/lib/multifactor.py
+++ b/Allura/allura/lib/multifactor.py
@@ -41,6 +41,7 @@ from ming.odm import session
 
 from allura.model.multifactor import RecoveryCode
 from allura.lib.utils import umask
+import six
 
 
 log = logging.getLogger(__name__)
@@ -230,7 +231,7 @@ class GoogleAuthenticatorFile(object):
     def dump(self):
         lines = []
         lines.append(b32encode(self.key).replace('=', ''))
-        for opt, value in self.options.iteritems():
+        for opt, value in six.iteritems(self.options):
             parts = ['"', opt]
             if value is not None:
                 parts.append(value)
diff --git a/Allura/allura/lib/patches.py b/Allura/allura/lib/patches.py
index c419954..743c2f2 100644
--- a/Allura/allura/lib/patches.py
+++ b/Allura/allura/lib/patches.py
@@ -27,6 +27,7 @@ import mock
 import json
 
 from allura.lib import helpers as h
+import six
 
 _patched = False
 def apply():
@@ -60,7 +61,7 @@ def apply():
         else:
             return
 
-        for content_type, content_engine in engines.iteritems():
+        for content_type, content_engine in six.iteritems(engines):
             template = template.split(':', 1)
             template.extend(content_engine[2:])
             try:
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index 4f80a58..e090e71 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -1063,7 +1063,7 @@ class ProjectRegistrationProvider(object):
             for i, tool in enumerate(project_template['tools'].keys()):
                 tool_config = project_template['tools'][tool]
                 tool_options = tool_config.get('options', {})
-                for k, v in tool_options.iteritems():
+                for k, v in six.iteritems(tool_options):
                     if isinstance(v, basestring):
                         tool_options[k] = \
                             string.Template(v).safe_substitute(
@@ -1532,7 +1532,7 @@ class ThemeProvider(object):
 
         if note_to_show:
             cookie_chunks = []
-            for note_id, views_closed in cookie_info.iteritems():
+            for note_id, views_closed in six.iteritems(cookie_info):
                 cookie_chunks.append('{}-{}-{}'.format(note_id, views_closed[0], views_closed[1]))
             set_cookie_value = '_'.join(sorted(cookie_chunks))
             return note_to_show, set_cookie_value
diff --git a/Allura/allura/lib/search.py b/Allura/allura/lib/search.py
index ac45ee4..6b86179 100644
--- a/Allura/allura/lib/search.py
+++ b/Allura/allura/lib/search.py
@@ -115,7 +115,7 @@ class SearchIndexable(object):
         # the same suffixes, but different field types. E.g.:
         # query 'shortname:test' with fields.keys() == ['name_t', 'shortname_s']
         # will be translated to 'shortname_t:test', which makes no sense
-        fields = sorted(fields.keys(), key=len, reverse=True)
+        fields = sorted(list(fields.keys()), key=len, reverse=True)
         for f in fields:
             if '_' in f:
                 base, typ = f.rsplit('_', 1)
@@ -171,7 +171,7 @@ def search_artifact(atype, q, history=False, rows=10, short_timeout=False, filte
         fq.append('project_id_s:%s' % c.project._id)
 
     fq += kw.pop('fq', [])
-    for name, values in (filter or {}).iteritems():
+    for name, values in six.iteritems((filter or {})):
         field_name = name + '_s'
         parts = []
         for v in values:
diff --git a/Allura/allura/lib/security.py b/Allura/allura/lib/security.py
index 3497305..3969ea8 100644
--- a/Allura/allura/lib/security.py
+++ b/Allura/allura/lib/security.py
@@ -105,7 +105,7 @@ class Credentials(object):
         roles_by_project = dict((pid, []) for pid in project_ids)
         for role in q:
             roles_by_project[role['project_id']].append(role)
-        for pid, roles in roles_by_project.iteritems():
+        for pid, roles in six.iteritems(roles_by_project):
             self.users[user_id, pid] = RoleCache(self, roles)
 
     def load_project_roles(self, *project_ids):
@@ -120,7 +120,7 @@ class Credentials(object):
         roles_by_project = dict((pid, []) for pid in project_ids)
         for role in q:
             roles_by_project[role['project_id']].append(role)
-        for pid, roles in roles_by_project.iteritems():
+        for pid, roles in six.iteritems(roles_by_project):
             self.projects[pid] = RoleCache(self, roles)
 
     def project_roles(self, project_id):
@@ -179,7 +179,7 @@ class RoleCache(object):
         self.q = q
 
     def find(self, **kw):
-        tests = kw.items()
+        tests = list(kw.items())
 
         def _iter():
             for r in self:
@@ -200,7 +200,7 @@ class RoleCache(object):
         return None
 
     def __iter__(self):
-        return self.index.itervalues()
+        return six.itervalues(self.index)
 
     def __len__(self):
         return len(self.index)
@@ -252,7 +252,7 @@ class RoleCache(object):
     @LazyProperty
     def reaching_roles(self):
         def _iter():
-            to_visit = self.index.items()
+            to_visit = list(self.index.items())
             project_ids = set([r['project_id'] for _id, r in to_visit])
             pr_index = {r['_id']: r for r in self.cred.project_role.find({
                 'project_id': {'$in': list(project_ids)},
diff --git a/Allura/allura/lib/solr.py b/Allura/allura/lib/solr.py
index ab5390d..18c6bd3 100644
--- a/Allura/allura/lib/solr.py
+++ b/Allura/allura/lib/solr.py
@@ -53,7 +53,7 @@ def escape_solr_arg(term):
     """ Apply escaping to the passed in query terms
         escaping special characters like : , etc"""
     term = term.replace('\\', r'\\')   # escape \ first
-    for char, escaped_char in escape_rules.iteritems():
+    for char, escaped_char in six.iteritems(escape_rules):
         term = term.replace(char, escaped_char)
 
     return term
diff --git a/Allura/allura/lib/utils.py b/Allura/allura/lib/utils.py
index 8e42ae2..02b8bd0 100644
--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -810,7 +810,7 @@ def smart_str(s, encoding='utf-8', strings_only=False, errors='strict'):
 
 
 def generate_smart_str(params):
-    for (key, value) in params.iteritems():
+    for (key, value) in six.iteritems(params):
         yield smart_str(key), smart_str(value)
 
 
diff --git a/Allura/allura/lib/validators.py b/Allura/allura/lib/validators.py
index ffc1a2a..9c8367b 100644
--- a/Allura/allura/lib/validators.py
+++ b/Allura/allura/lib/validators.py
@@ -25,6 +25,7 @@ from formencode import validators as fev
 from tg import tmpl_context as c
 from . import helpers as h
 from datetime import datetime
+import six
 
 
 class URL(fev.URL):
@@ -299,7 +300,7 @@ class UserMapJsonFile(JsonFile):
     def _to_python(self, value, state):
         value = super(self.__class__, self)._to_python(value, state)
         try:
-            for k, v in value.iteritems():
+            for k, v in six.iteritems(value):
                 if not(isinstance(k, basestring) and isinstance(v, basestring)):
                     raise
             return json.dumps(value) if self.as_string else value
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index 1979901..25919cd 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -30,6 +30,7 @@ from allura.lib import validators as V
 from allura.lib.widgets import form_fields as ffw
 from allura.lib.widgets import forms as ff
 from allura import model as M
+import six
 
 
 class NullValidator(fev.FancyValidator):
@@ -268,7 +269,7 @@ class HierWidget(ew_core.Widget):
         return response
 
     def resources(self):
-        for w in self.widgets.itervalues():
+        for w in six.itervalues(self.widgets):
             for r in w.resources():
                 yield r
 
@@ -315,7 +316,7 @@ class Post(HierWidget):
     def resources(self):
         for r in super(Post, self).resources():
             yield r
-        for w in self.widgets.itervalues():
+        for w in six.itervalues(self.widgets):
             for r in w.resources():
                 yield r
         yield ew.CSSScript('''
@@ -361,7 +362,7 @@ class Thread(HierWidget):
     def resources(self):
         for r in super(Thread, self).resources():
             yield r
-        for w in self.widgets.itervalues():
+        for w in six.itervalues(self.widgets):
             for r in w.resources():
                 yield r
         yield ew.JSScript('''
diff --git a/Allura/allura/lib/widgets/form_fields.py b/Allura/allura/lib/widgets/form_fields.py
index 0ee7067..52c678a 100644
--- a/Allura/allura/lib/widgets/form_fields.py
+++ b/Allura/allura/lib/widgets/form_fields.py
@@ -27,6 +27,7 @@ from webhelpers import paginate
 
 import ew as ew_core
 import ew.jinja2_ew as ew
+import six
 
 log = logging.getLogger(__name__)
 
@@ -328,7 +329,7 @@ class PageList(ew_core.Widget):
     @property
     def url_params(self, **kw):
         url_params = dict()
-        for k, v in request.params.iteritems():
+        for k, v in six.iteritems(request.params):
             if k not in ['limit', 'count', 'page']:
                 url_params[k] = v
         return url_params
@@ -346,7 +347,7 @@ class PageSize(ew_core.Widget):
     @property
     def url_params(self, **kw):
         url_params = dict()
-        for k, v in request.params.iteritems():
+        for k, v in six.iteritems(request.params):
             if k not in ['limit', 'count', 'page']:
                 url_params[k] = v
         return url_params
@@ -445,7 +446,7 @@ class StateField(JQueryMixin, ew.CompoundField):
 
     @property
     def fields(self):
-        return [self.selector] + self.states.values()
+        return [self.selector] + list(self.states.values())
 
 
 class DateField(JQueryMixin, ew.TextField):
diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index 4b3e9e4..67baa1f 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -36,6 +36,7 @@ from allura.lib import plugin
 from allura.lib.widgets import form_fields as ffw
 from allura.lib import exceptions as forge_exc
 from allura import model as M
+import six
 
 
 log = logging.getLogger(__name__)
@@ -260,7 +261,7 @@ class PersonalDataForm(ForgeForm):
                 validator=V.MapValidator(country_names, not_empty=False),
                 options=[ew.Option(py_value=" ", label=" -- Unknown -- ", selected=False)] +
                         [ew.Option(py_value=c, label=n, selected=False)
-                         for c, n in sorted(country_names.items(),
+                         for c, n in sorted(list(country_names.items()),
                                             key=lambda (k, v): v)],
                 attrs={'onchange': 'selectTimezone(this.value)'}),
             ew.TextField(
@@ -978,7 +979,7 @@ class NeighborhoodAddProjectForm(ForgeForm):
     def fields(self):
         provider = plugin.ProjectRegistrationProvider.get()
         tools_options = []
-        for ep, tool in g.entry_points["tool"].iteritems():
+        for ep, tool in six.iteritems(g.entry_points["tool"]):
             if tool.status == 'production' and tool._installable(tool_name=ep,
                                                                  nbhd=c.project.neighborhood,
                                                                  project_tools=[]):
diff --git a/Allura/allura/lib/widgets/user_profile.py b/Allura/allura/lib/widgets/user_profile.py
index bc517fa..fd2e17e 100644
--- a/Allura/allura/lib/widgets/user_profile.py
+++ b/Allura/allura/lib/widgets/user_profile.py
@@ -76,7 +76,7 @@ class SectionsUtil(object):
         for section in re.split(r'\s*,\s*', section_ordering):
             if section in sections:
                 ordered_sections.append(sections.pop(section))
-        sections = ordered_sections + sections.values()
+        sections = ordered_sections + list(sections.values())
         return sections
 
 
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index 37425fa..d3a6f1c 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -47,6 +47,7 @@ from .project import AppConfig
 from .notification import MailFooter
 
 from .filesystem import File
+import six
 
 log = logging.getLogger(__name__)
 
@@ -632,7 +633,7 @@ class VersionedArtifact(Artifact):
     def revert(self, version):
         ss = self.get_version(version)
         old_version = self.version
-        for k, v in ss.data.iteritems():
+        for k, v in six.iteritems(ss.data):
             setattr(self, k, v)
         self.version = old_version
 
diff --git a/Allura/allura/model/index.py b/Allura/allura/model/index.py
index 47c6ddb..8cd1828 100644
--- a/Allura/allura/model/index.py
+++ b/Allura/allura/model/index.py
@@ -38,6 +38,7 @@ from allura.lib import helpers as h
 
 from .session import main_doc_session, main_orm_session
 from .project import Project
+import six
 
 log = logging.getLogger(__name__)
 
@@ -167,13 +168,13 @@ class Shortlink(object):
                 else:
                     result[link] = parsed_links.pop(link)
             q = cls.query.find(dict(
-                link={'$in': links_by_artifact.keys()},
+                link={'$in': list(links_by_artifact.keys())},
                 project_id={'$in': list(project_ids)}
             ), validate=False)
             matches_by_artifact = dict(
                 (link, list(matches))
                 for link, matches in groupby(q, key=lambda s: unquote(s.link)))
-            for link, d in parsed_links.iteritems():
+            for link, d in six.iteritems(parsed_links):
                 matches = matches_by_artifact.get(unquote(d['artifact']), [])
                 matches = (
                     m for m in matches
diff --git a/Allura/allura/model/notification.py b/Allura/allura/model/notification.py
index 4c41129..cc67922 100644
--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -58,6 +58,7 @@ import allura.tasks.mail_tasks
 
 from .session import main_orm_session
 from .auth import User, AlluraUserProperty
+import six
 
 
 log = logging.getLogger(__name__)
@@ -651,7 +652,7 @@ class Mailbox(MappedClass):
                         'Error sending notification: %s to mbox %s (user %s)',
                         n._id, self._id, self.user_id)
             # Accumulate messages from same address with same subject
-            for (subject, from_address, reply_to_address, author_id), ns in ngroups.iteritems():
+            for (subject, from_address, reply_to_address, author_id), ns in six.iteritems(ngroups):
                 try:
                     if len(ns) == 1:
                         ns[0].send_direct(self.user_id)
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index 97319e3..49b3dbe 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -62,6 +62,7 @@ from .types import ACL, ACE
 from .monq_model import MonQTask
 
 from .filesystem import File
+import six
 
 log = logging.getLogger(__name__)
 
@@ -480,7 +481,7 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
         project_index = dict((p._id, p) for p in projects)
         result = dict((p._id, None) for p in projects)
         for icon in ProjectFile.query.find(dict(
-                project_id={'$in': result.keys()},
+                project_id={'$in': list(result.keys())},
                 category='icon')):
             result[icon.project_id] = project_index[icon.project_id].url() + 'icon'
         return result
@@ -491,7 +492,7 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
         from .artifact import AwardGrant
         result = dict((p._id, []) for p in projects)
         for award in AwardGrant.query.find(dict(
-                granted_to_project_id={'$in': result.keys()})):
+                granted_to_project_id={'$in': list(result.keys())})):
             result[award.granted_to_project_id].append(award)
         return result
 
@@ -574,8 +575,8 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
                     entry.ui_icon = 'tool-%s' % entry.tool_name.lower()
                     if is_nofollow_url(entry.url):
                         entry.extra_html_attrs = {'rel': 'nofollow'}
-                    if not self.is_nbhd_project and (entry.tool_name.lower() in anchored_tools.keys()):
-                        ordinal = anchored_tools.keys().index(
+                    if not self.is_nbhd_project and (entry.tool_name.lower() in list(anchored_tools.keys())):
+                        ordinal = list(anchored_tools.keys()).index(
                             entry.tool_name.lower())
                     elif ac.tool_name == 'admin':
                         ordinal = 100
@@ -610,7 +611,7 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
         i = 0
         new_tools = []
         if not self.is_nbhd_project:
-            for tool, label in anchored_tools.iteritems():
+            for tool, label in six.iteritems(anchored_tools):
                 if (tool not in installed_tools) and (self.app_instance(tool) is None):
                     try:
                         new_tools.append(
@@ -633,7 +634,7 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
                          icon=s.ui_icon or 'tool-admin',
                          tool_name=s.tool_name or 'sub',
                          mount_point=s.mount_point,
-                         is_anchored=s.tool_name in anchored_tools.keys(),
+                         is_anchored=s.tool_name in list(anchored_tools.keys()),
                          )
             if admin_options and s.tool_name and s.mount_point:
                 try:
@@ -707,7 +708,7 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
                         e.mount_point = None
                         e.extra_html_attrs = {}
                         grouped_nav[tool_name].children.append(e)
-        return grouped_nav.values()
+        return list(grouped_nav.values())
 
     def parent_iter(self):
         yield self
@@ -762,7 +763,7 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
             mount_points[App] = mount_point
 
         # count mount point names
-        mount_point_counts = Counter(mount_points.values())
+        mount_point_counts = Counter(list(mount_points.values()))
 
         # install each app with unique names
         for app_params in apps_params:
@@ -824,7 +825,7 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
         options['mount_label'] = mount_label or App.default_mount_label or mount_point
         options['ordinal'] = int(ordinal)
         options_on_install = {o.name: o for o in App.options_on_install()}
-        for o, val in override_options.iteritems():
+        for o, val in six.iteritems(override_options):
             if o in options_on_install:
                 val = self._validate_tool_option(options_on_install[o], val)
             options[o] = val
@@ -895,8 +896,8 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
         for ac in self.app_configs:
             App = g.entry_points['tool'].get(ac.tool_name)
             if include_hidden or App and not App.hidden:
-                if not self.is_nbhd_project and (ac.tool_name.lower() in anchored_tools.keys()):
-                    ordinal = anchored_tools.keys().index(ac.tool_name.lower())
+                if not self.is_nbhd_project and (ac.tool_name.lower() in list(anchored_tools.keys())):
+                    ordinal = list(anchored_tools.keys()).index(ac.tool_name.lower())
                 else:
                     ordinal = int(ac.options.get('ordinal', 0)) + i
                 result.append({'ordinal': int(ordinal), 'ac': ac})
diff --git a/Allura/allura/model/repo_refresh.py b/Allura/allura/model/repo_refresh.py
index 49d911b..86edbd8 100644
--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -39,6 +39,7 @@ from allura.model.repository import Commit, Tree, LastCommit, ModelCache
 from allura.model.index import ArtifactReferenceDoc, ShortlinkDoc
 from allura.model.auth import User
 from allura.model.timeline import TransientActor
+import six
 
 log = logging.getLogger(__name__)
 
@@ -106,10 +107,10 @@ def refresh_repo(repo, all_commits=False, notify=True, new_clone=False, commits_
         from allura.webhooks import RepoPushWebhookSender
         by_branches, by_tags = _group_commits(repo, commit_ids)
         params = []
-        for b, commits in by_branches.iteritems():
+        for b, commits in six.iteritems(by_branches):
             ref = 'refs/heads/{}'.format(b) if b != '__default__' else None
             params.append(dict(commit_ids=commits, ref=ref))
-        for t, commits in by_tags.iteritems():
+        for t, commits in six.iteritems(by_tags):
             ref = 'refs/tags/{}'.format(t)
             params.append(dict(commit_ids=commits, ref=ref))
         if params:
@@ -306,11 +307,11 @@ def _group_commits(repo, commit_ids):
         if tags:
             current_tags = tags
         for b in current_branches:
-            if b not in by_branches.keys():
+            if b not in list(by_branches.keys()):
                 by_branches[b] = []
             by_branches[b].append(commit)
         for t in current_tags:
-            if t not in by_tags.keys():
+            if t not in list(by_tags.keys()):
                 by_tags[t] = []
             by_tags[t].append(commit)
     return by_branches, by_tags
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index ac80114..4a951d0 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -1062,7 +1062,7 @@ class Commit(RepoObject, ActivityObject):
     repo = None
 
     def __init__(self, **kw):
-        for k, v in kw.iteritems():
+        for k, v in six.iteritems(kw):
             setattr(self, k, v)
 
     @property
@@ -1626,13 +1626,13 @@ class LastCommit(RepoObject):
                 entries = {}
             # paths are fully-qualified; shorten them back to just node names
             entries = {
-                os.path.basename(path): commit_id for path, commit_id in entries.iteritems()}
+                os.path.basename(path): commit_id for path, commit_id in six.iteritems(entries)}
         # update with the nodes changed in this tree's commit
         entries.update({node: tree.commit._id for node in changed})
         # convert to a list of dicts, since mongo doesn't handle arbitrary keys
         # well (i.e., . and $ not allowed)
         entries = [{'name': name, 'commit_id': value}
-                   for name, value in entries.iteritems()]
+                   for name, value in six.iteritems(entries)]
         lcd = cls(
             commit_id=tree.commit._id,
             path=path,
@@ -1690,7 +1690,7 @@ class ModelCache(object):
     def _normalize_query(self, query):
         _query = query
         if not isinstance(_query, tuple):
-            _query = tuple(sorted(_query.items(), key=lambda k: k[0]))
+            _query = tuple(sorted(list(_query.items()), key=lambda k: k[0]))
         return _query
 
     def _model_query(self, cls):
@@ -1789,7 +1789,7 @@ class ModelCache(object):
             return len(self._instance_cache[cls])
 
     def instance_ids(self, cls):
-        return self._instance_cache[cls].keys()
+        return list(self._instance_cache[cls].keys())
 
     def batch_load(self, cls, query, attrs=None):
         '''
@@ -1800,7 +1800,7 @@ class ModelCache(object):
         the given query.
         '''
         if attrs is None:
-            attrs = query.keys()
+            attrs = list(query.keys())
         for result in self._model_query(cls).find(query):
             keys = {a: getattr(result, a) for a in attrs}
             self.set(cls, keys, result)
@@ -1864,9 +1864,9 @@ class GitLikeTree(object):
     def __repr__(self):
         # this can't change, is used in hex() above
         lines = ['t %s %s' % (t.hex(), h.really_unicode(name))
-                 for name, t in self.trees.iteritems()]
+                 for name, t in six.iteritems(self.trees)]
         lines += ['b %s %s' % (oid, h.really_unicode(name))
-                  for name, oid in self.blobs.iteritems()]
+                  for name, oid in six.iteritems(self.blobs)]
         return h.really_unicode('\n'.join(sorted(lines))).encode('utf-8')
 
     def __unicode__(self):
@@ -1877,9 +1877,9 @@ class GitLikeTree(object):
         lines = [' ' * indent + 't %s %s' %
                  (name, '\n' + t.unicode_full_tree(indent + 2, show_id=show_id)
                   if recurse else t.hex())
-                 for name, t in sorted(self.trees.iteritems())]
+                 for name, t in sorted(six.iteritems(self.trees))]
         lines += [' ' * indent + 'b %s %s' % (name, oid if show_id else '')
-                  for name, oid in sorted(self.blobs.iteritems())]
+                  for name, oid in sorted(six.iteritems(self.blobs))]
         output = h.really_unicode('\n'.join(lines)).encode('utf-8')
         return output
 
diff --git a/Allura/allura/model/session.py b/Allura/allura/model/session.py
index cb4255a..1b44c48 100644
--- a/Allura/allura/model/session.py
+++ b/Allura/allura/model/session.py
@@ -29,6 +29,7 @@ from contextlib import contextmanager
 
 from allura.lib.utils import chunked_list
 from allura.tasks import index_tasks
+import six
 
 log = logging.getLogger(__name__)
 
@@ -105,7 +106,7 @@ class IndexerSessionExtension(ManagedSessionExtension):
         for obj_list, action in actions:
             if obj_list:
                 types_objects_map = self._objects_by_types(obj_list)
-                for class_path, obj_list in types_objects_map.iteritems():
+                for class_path, obj_list in six.iteritems(types_objects_map):
                     tasks = self.TASKS.get(class_path)
                     if tasks:
                         self._index_action(tasks, obj_list, action)
diff --git a/Allura/allura/scripts/trac_export.py b/Allura/allura/scripts/trac_export.py
index bbdde95..ecadac5 100644
--- a/Allura/allura/scripts/trac_export.py
+++ b/Allura/allura/scripts/trac_export.py
@@ -105,7 +105,7 @@ class TracExport(object):
     def remap_fields(self, dict):
         "Remap fields to adhere to standard taxonomy."
         out = {}
-        for k, v in dict.iteritems():
+        for k, v in six.iteritems(dict):
             key = self.match_pattern(r'\W*(\w+)\W*', k)
             out[self.FIELD_MAP.get(key, key)] = v
 
diff --git a/Allura/allura/tests/functional/test_auth.py b/Allura/allura/tests/functional/test_auth.py
index def21d4..67479e1 100644
--- a/Allura/allura/tests/functional/test_auth.py
+++ b/Allura/allura/tests/functional/test_auth.py
@@ -54,6 +54,7 @@ from allura import model as M
 from allura.lib import plugin
 from allura.lib import helpers as h
 from allura.lib.multifactor import TotpService, RecoveryCodeService
+import six
 
 
 def unentity(s):
@@ -848,7 +849,7 @@ class TestAuth(TestController):
 
     def _find_subscriptions_form(self, r):
         form = None
-        for f in r.forms.itervalues():
+        for f in six.itervalues(r.forms):
             if f.action == 'update_subscriptions':
                 form = f
                 break
@@ -857,7 +858,7 @@ class TestAuth(TestController):
 
     def _find_subscriptions_field(self, form, subscribed=False):
         field_name = None
-        for k, v in form.fields.iteritems():
+        for k, v in six.iteritems(form.fields):
             if subscribed:
                 check = c and v[0].value == 'on'
             else:
diff --git a/Allura/allura/tests/functional/test_rest.py b/Allura/allura/tests/functional/test_rest.py
index 310d172..b885ed4 100644
--- a/Allura/allura/tests/functional/test_rest.py
+++ b/Allura/allura/tests/functional/test_rest.py
@@ -438,7 +438,7 @@ class TestDoap(TestRestApiBase):
         user = maintainers[0].find(self.foaf + 'Person')
         assert_equal(user.find(self.foaf + 'name').text, 'Test Admin')
         assert_equal(user.find(self.foaf + 'nick').text, 'test-admin')
-        assert_equal(user.find(self.foaf + 'homepage').items()[0][1],
+        assert_equal(list(user.find(self.foaf + 'homepage').items())[0][1],
                      'http://localhost/u/test-admin/')
 
     @td.with_tool('test', 'Tickets', 'bugs')
@@ -457,7 +457,7 @@ class TestDoap(TestRestApiBase):
         p = r.xml.find(self.ns + 'Project')
         tools = p.findall(self.ns_sf + 'feature')
         tools = [(t.find(self.ns_sf + 'Feature').find(self.ns + 'name').text,
-                  t.find(self.ns_sf + 'Feature').find(self.foaf + 'page').items()[0][1])
+                  list(t.find(self.ns_sf + 'Feature').find(self.foaf + 'page').items())[0][1])
                  for t in tools]
         assert_in(('Tickets', 'http://localhost/p/test/bugs/'), tools)
         assert_in(('Tickets', 'http://localhost/p/test/private-bugs/'), tools)
@@ -468,7 +468,7 @@ class TestDoap(TestRestApiBase):
         p = r.xml.find(self.ns + 'Project')
         tools = p.findall(self.ns_sf + 'feature')
         tools = [(t.find(self.ns_sf + 'Feature').find(self.ns + 'name').text,
-                  t.find(self.ns_sf + 'Feature').find(self.foaf + 'page').items()[0][1])
+                  list(t.find(self.ns_sf + 'Feature').find(self.foaf + 'page').items())[0][1])
                  for t in tools]
         assert_in(('Tickets', 'http://localhost/p/test/bugs/'), tools)
         assert_not_in(('Tickets', 'http://localhost/p/test/private-bugs/'), tools)
diff --git a/Allura/allura/tests/functional/test_site_admin.py b/Allura/allura/tests/functional/test_site_admin.py
index 93f30f2..f5ce746 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -35,6 +35,7 @@ from allura.tests import decorators as td
 from allura.lib import helpers as h
 from allura.lib.decorators import task
 from allura.lib.plugin import LocalAuthenticationProvider
+import six
 
 
 class TestSiteAdmin(TestController):
@@ -504,7 +505,7 @@ class TestUserDetails(TestController):
     def test_add_comment(self):
         r = self.app.get('/nf/admin/user/test-user')
         assert_not_in('Comment by test-admin: I was hêre!', r)
-        form = [f for f in r.forms.itervalues() if f.action.endswith('add_audit_trail_entry')][0]
+        form = [f for f in six.itervalues(r.forms) if f.action.endswith('add_audit_trail_entry')][0]
         assert_equal(form['username'].value, 'test-user')
         form['comment'] = 'I was hêre!'
         r = form.submit()
diff --git a/Allura/allura/tests/model/test_auth.py b/Allura/allura/tests/model/test_auth.py
index 79a7786..039a969 100644
--- a/Allura/allura/tests/model/test_auth.py
+++ b/Allura/allura/tests/model/test_auth.py
@@ -254,9 +254,9 @@ def test_default_project_roles():
         for pr in M.ProjectRole.query.find(dict(
             project_id=c.project._id)).all()
         if pr.name)
-    assert 'Admin' in roles.keys(), roles.keys()
-    assert 'Developer' in roles.keys(), roles.keys()
-    assert 'Member' in roles.keys(), roles.keys()
+    assert 'Admin' in list(roles.keys()), list(roles.keys())
+    assert 'Developer' in list(roles.keys()), list(roles.keys())
+    assert 'Member' in list(roles.keys()), list(roles.keys())
     assert roles['Developer']._id in roles['Admin'].roles
     assert roles['Member']._id in roles['Developer'].roles
 
diff --git a/Allura/allura/tests/model/test_notification.py b/Allura/allura/tests/model/test_notification.py
index ec2546a..31e2fe5 100644
--- a/Allura/allura/tests/model/test_notification.py
+++ b/Allura/allura/tests/model/test_notification.py
@@ -493,7 +493,7 @@ class TestSiteNotification(unittest.TestCase):
         assert isinstance(note_json, dict)
 
     def test_json_keys(self):
-        keys = self.note.__json__().keys()
+        keys = list(self.note.__json__().keys())
         assert 'active' in keys
         assert 'impressions' in keys
         assert 'content' in keys
diff --git a/Allura/allura/tests/model/test_repo.py b/Allura/allura/tests/model/test_repo.py
index 8eea5db..160f1ac 100644
--- a/Allura/allura/tests/model/test_repo.py
+++ b/Allura/allura/tests/model/test_repo.py
@@ -213,7 +213,7 @@ class TestLastCommit(unittest.TestCase):
         return commit
 
     def _log(self, revs, path, id_only=True, limit=None):
-        for commit_id, commit in reversed(self.repo._commits.items()):
+        for commit_id, commit in reversed(list(self.repo._commits.items())):
             if path in commit.changed_paths:
                 yield commit_id
 
diff --git a/Allura/allura/tests/test_helpers.py b/Allura/allura/tests/test_helpers.py
index 514f43e..bf1d5e0 100644
--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -186,7 +186,7 @@ def test_context_setters():
 
 def test_encode_keys():
     kw = h.encode_keys({'foo': 5})
-    assert type(kw.keys()[0]) != six.text_type
+    assert type(list(kw.keys())[0]) != six.text_type
 
 
 def test_ago():
@@ -229,7 +229,7 @@ def test_paging_sanitizer():
         (10, 0): (10, 0),
         ('junk', 'more junk'): (25, 0),
     }
-    for input, output in test_data.iteritems():
+    for input, output in six.iteritems(test_data):
         assert (h.paging_sanitizer(*input)) == output
 
 
diff --git a/Allura/allura/tests/unit/test_ldap_auth_provider.py b/Allura/allura/tests/unit/test_ldap_auth_provider.py
index 4ced1ab..5945581 100644
--- a/Allura/allura/tests/unit/test_ldap_auth_provider.py
+++ b/Allura/allura/tests/unit/test_ldap_auth_provider.py
@@ -35,6 +35,7 @@ from alluratest.controller import setup_basic_test
 from allura.lib import plugin
 from allura.lib import helpers as h
 from allura import model as M
+import six
 
 
 class TestLdapAuthenticationProvider(object):
@@ -77,7 +78,7 @@ class TestLdapAuthenticationProvider(object):
             'password': 'test-password',
         }
         self.provider.request.method = 'POST'
-        self.provider.request.body = '&'.join(['%s=%s' % (k,v) for k,v in params.iteritems()]).encode('utf-8')
+        self.provider.request.body = '&'.join(['%s=%s' % (k,v) for k,v in six.iteritems(params)]).encode('utf-8')
         ldap.dn.escape_dn_chars = lambda x: x
 
         self.provider._login()
@@ -96,7 +97,7 @@ class TestLdapAuthenticationProvider(object):
             'password': 'test-password',
         }
         self.provider.request.method = 'POST'
-        self.provider.request.body = '&'.join(['%s=%s' % (k,v) for k,v in params.iteritems()]).encode('utf-8')
+        self.provider.request.body = '&'.join(['%s=%s' % (k,v) for k,v in six.iteritems(params)]).encode('utf-8')
         ldap.dn.escape_dn_chars = lambda x: x
         dn = 'uid=%s,ou=people,dc=localdomain' % params['username']
         conn = ldap.initialize.return_value
diff --git a/Allura/allura/webhooks.py b/Allura/allura/webhooks.py
index 4c8447f..31b6bef 100644
--- a/Allura/allura/webhooks.py
+++ b/Allura/allura/webhooks.py
@@ -221,7 +221,7 @@ class WebhookRestController(BaseController):
         error = getattr(e, 'error_dict', None)
         if error:
             _error = {}
-            for k, v in error.iteritems():
+            for k, v in six.iteritems(error):
                 _error[k] = six.text_type(v)
             return _error
         error = getattr(e, 'msg', None)
diff --git a/Allura/allura/websetup/bootstrap.py b/Allura/allura/websetup/bootstrap.py
index fc5b703..7ddc24f 100644
--- a/Allura/allura/websetup/bootstrap.py
+++ b/Allura/allura/websetup/bootstrap.py
@@ -44,6 +44,7 @@ from allura.command import CreateTroveCategoriesCommand
 from allura.websetup.schema import REGISTRY
 
 from forgewiki import model as WM
+import six
 
 log = logging.getLogger(__name__)
 
@@ -254,7 +255,7 @@ def bootstrap(command, conf, vars):
             log.info('Registering initial apps')
             with h.push_config(c, user=u_admin):
                 p0.install_apps([{'ep_name': ep_name}
-                                 for ep_name, app in g.entry_points['tool'].iteritems()
+                                 for ep_name, app in six.iteritems(g.entry_points['tool'])
                                  if app._installable(tool_name=ep_name,
                                                      nbhd=n_projects,
                                                      project_tools=[])
diff --git a/AlluraTest/alluratest/controller.py b/AlluraTest/alluratest/controller.py
index b1c48b4..b5e53de 100644
--- a/AlluraTest/alluratest/controller.py
+++ b/AlluraTest/alluratest/controller.py
@@ -46,6 +46,7 @@ from allura.lib import helpers as h
 from allura.websetup.schema import REGISTRY
 #from allura.lib.custom_middleware import environ as ENV, MagicalC
 from .validation import ValidatingTestApp
+import six
 
 DFL_APP_NAME = 'main'
 
@@ -212,7 +213,7 @@ class TestController(object):
 
     def find_form(self, resp, cond):
         """Find form on the page that meets given condition"""
-        for f in resp.forms.itervalues():
+        for f in six.itervalues(resp.forms):
             if cond(f):
                 return f
 
diff --git a/AlluraTest/alluratest/validation.py b/AlluraTest/alluratest/validation.py
index 8e94b14..df2f246 100644
--- a/AlluraTest/alluratest/validation.py
+++ b/AlluraTest/alluratest/validation.py
@@ -226,7 +226,7 @@ class AntiSpamTestApp(TestApp):
                 antispam.enc('honey0'): '',
                 antispam.enc('honey1'): '',
             }
-            for k, v in kwargs['params'].iteritems():
+            for k, v in six.iteritems(kwargs['params']):
                 params[antispam.enc(k)] = v
             params['_session_id'] = kwargs['params'].get('_session_id')  # exclude csrf token from encryption
             kwargs['params'] = params
@@ -240,7 +240,7 @@ class AntiSpamTestApp(TestApp):
         timestamp = form['timestamp'].value
         spinner = form['spinner'].value
         antispam = utils.AntiSpam(timestamp=int(timestamp), spinner=utils.AntiSpam._unwrap(spinner))
-        names = form.fields.keys()
+        names = list(form.fields.keys())
         name_mapping = {}
         for name in names:
             try:
@@ -258,7 +258,7 @@ class PostParamCheckingTestApp(AntiSpamTestApp):
             return
         # params can be a list or a dict
         if hasattr(params, 'items'):
-            params = params.items()
+            params = list(params.items())
         for k, v in params:
             if not isinstance(k, basestring):
                 raise TypeError('%s key %s is %s, not str' %
diff --git a/ForgeBlog/forgeblog/main.py b/ForgeBlog/forgeblog/main.py
index 56488b5..89d7ebd 100644
--- a/ForgeBlog/forgeblog/main.py
+++ b/ForgeBlog/forgeblog/main.py
@@ -435,7 +435,7 @@ class PostController(BaseController, FeedController):
         old_text = self.post.text
         if attachment is not None:
             self.post.add_multiple_attachments(attachment)
-        for k, v in kw.iteritems():
+        for k, v in six.iteritems(kw):
             setattr(self.post, k, v)
         self.post.commit()
         notification_tasks.send_usermentions_notification.post(self.post.index_id(), kw['text'], old_text)
diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py
index 2583ba9..d2b56bb 100644
--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -36,6 +36,7 @@ from allura.model.timeline import ActivityObject
 from allura.model.types import MarkdownCache
 from allura.lib import helpers as h
 from allura.lib import utils
+import six
 
 config = utils.ConfigProxy(
     common_suffix='forgemail.domain')
@@ -295,7 +296,7 @@ class BlogPost(M.VersionedArtifact, ActivityObject):
     def new(cls, **kw):
         post = cls()
         subscribe = kw.pop('subscribe', False)
-        for k, v in kw.iteritems():
+        for k, v in six.iteritems(kw):
             setattr(post, k, v)
         post.neighborhood_id = c.project.neighborhood_id
         post.make_slug()
diff --git a/ForgeDiscussion/forgediscussion/import_support.py b/ForgeDiscussion/forgediscussion/import_support.py
index f1040f6..cd8a334 100644
--- a/ForgeDiscussion/forgediscussion/import_support.py
+++ b/ForgeDiscussion/forgediscussion/import_support.py
@@ -29,6 +29,7 @@ from tg import tmpl_context as c
 from allura import model as M
 
 from forgediscussion import model as DM
+import six
 
 log = logging.getLogger(__name__)
 
@@ -52,11 +53,11 @@ def perform_import(json, username_mapping, default_username=None, create_users=F
                     c.app.config.options.mount_point,
                     w)
 
-    for name, forum in json.forums.iteritems():
+    for name, forum in six.iteritems(json.forums):
         log.info('... %s has %d threads with %d total posts',
-                 name, len(forum.threads), sum(len(t) for t in forum.threads.itervalues()))
+                 name, len(forum.threads), sum(len(t) for t in six.itervalues(forum.threads)))
 
-    for name, forum in json.forums.iteritems():
+    for name, forum in six.iteritems(json.forums):
         log.info('... creating %s/%s: %s',
                  c.project.shortname,
                  c.app.config.options.mount_point,
@@ -66,7 +67,7 @@ def perform_import(json, username_mapping, default_username=None, create_users=F
             name=forum['name'],
             shortname=forum['name'],
             description=forum['description'])
-        for tid, posts in forum.threads.iteritems():
+        for tid, posts in six.iteritems(forum.threads):
             rest, head = posts[:-1], posts[-1]
             t = DM.ForumThread.new(
                 _id=tid,
diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py
index f00ecc1..8f18ad4 100644
--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -50,6 +50,7 @@ from forgesvn import model as SM
 from forgesvn.model.svn import svn_path_exists
 from forgesvn.tests import with_svn
 from allura.tests.decorators import with_tool
+import six
 
 
 class TestNewRepo(unittest.TestCase):
@@ -652,7 +653,7 @@ class _Test(unittest.TestCase):
         t, isnew = M.repository.Tree.upsert(object_id)
         repo = getattr(self, 'repo', None)
         t.repo = repo
-        for k, v in kwargs.iteritems():
+        for k, v in six.iteritems(kwargs):
             if isinstance(v, basestring):
                 obj = M.repository.Blob(
                     t, k, self.idgen.next())
diff --git a/ForgeTracker/forgetracker/import_support.py b/ForgeTracker/forgetracker/import_support.py
index 6b3faaf..0fb4103 100644
--- a/ForgeTracker/forgetracker/import_support.py
+++ b/ForgeTracker/forgetracker/import_support.py
@@ -34,6 +34,7 @@ from allura.lib.plugin import ImportIdConverter
 
 # Local imports
 from forgetracker import model as TM
+import six
 
 try:
     from forgeimporters.base import ProjectExtractor
@@ -199,7 +200,7 @@ class ImportSupport(object):
 
     def make_artifact(self, ticket_dict):
         remapped = {}
-        for f, v in ticket_dict.iteritems():
+        for f, v in six.iteritems(ticket_dict):
             transform = self.FIELD_MAP.get(f, ())
             if transform is None:
                 continue
@@ -309,7 +310,7 @@ class ImportSupport(object):
     def validate_user_mapping(self):
         if 'user_map' not in self.options:
             self.options['user_map'] = {}
-        for foreign_user, allura_user in self.options['user_map'].iteritems():
+        for foreign_user, allura_user in six.iteritems(self.options['user_map']):
             u = M.User.by_username(allura_user)
             if not u:
                 raise ImportException(
@@ -325,7 +326,7 @@ class ImportSupport(object):
         self.validate_user_mapping()
 
         project_doc = json.loads(doc)
-        tracker_names = project_doc['trackers'].keys()
+        tracker_names = list(project_doc['trackers'].keys())
         if len(tracker_names) > 1:
             self.errors.append('Only single tracker import is supported')
             return self.errors, self.warnings
@@ -345,7 +346,7 @@ option user_map to avoid losing username information. Unknown users: %s''' % unk
         self.validate_user_mapping()
 
         project_doc = json.loads(doc)
-        tracker_names = project_doc['trackers'].keys()
+        tracker_names = list(project_doc['trackers'].keys())
         if len(tracker_names) > 1:
             self.errors.append('Only single tracker import is supported')
             return self.errors, self.warnings
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index d10de45..17e890e 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -282,7 +282,7 @@ class Globals(MappedClass):
             app_config_id=self.app_config_id)).sort('ticket_num').all()
         filtered = self.filtered_by_subscription({t._id: t for t in tickets})
         original_ticket_nums = {t._id: t.ticket_num for t in tickets}
-        users = User.query.find({'_id': {'$in': filtered.keys()}}).all()
+        users = User.query.find({'_id': {'$in': list(filtered.keys())}}).all()
         moved_tickets = {}
         for ticket in tickets:
             moved = ticket.move(tracker, notify=False)
@@ -324,7 +324,7 @@ class Globals(MappedClass):
                 'original_num': original_ticket_nums[_id],
                 'destination_num': moved_tickets[_id].ticket_num,
                 'summary': moved_tickets[_id].summary
-            } for _id, t in moved_tickets.iteritems()
+            } for _id, t in six.iteritems(moved_tickets)
                 if (not t.private or
                     self.app_config.options.get('TicketMonitoringType') ==
                     'AllTicketChanges')]
@@ -392,7 +392,7 @@ class Globals(MappedClass):
             if labels:
                 values['labels'] = self.append_new_labels(
                     ticket.labels, labels.split(','))
-            for k, v in sorted(values.iteritems()):
+            for k, v in sorted(six.iteritems(values)):
                 if k == 'deleted':
                     if v:
                         ticket.soft_delete()
@@ -422,7 +422,7 @@ class Globals(MappedClass):
                         v,
                         getattr(ticket, k))
                 setattr(ticket, k, v)
-            for k, v in sorted(custom_values.iteritems()):
+            for k, v in sorted(six.iteritems(custom_values)):
                 def cf_val(cf):
                     return ticket.get_custom_user(cf.name) \
                         if cf.type == 'user' \
@@ -445,7 +445,7 @@ class Globals(MappedClass):
 
         filtered_changes = self.filtered_by_subscription(changed_tickets)
         users = User.query.find(
-            {'_id': {'$in': filtered_changes.keys()}}).all()
+            {'_id': {'$in': list(filtered_changes.keys())}}).all()
 
         def changes_iter(user):
             for t_id in filtered_changes.get(user._id, []):
@@ -463,12 +463,12 @@ class Globals(MappedClass):
         )
         tmpl = g.jinja2_env.get_template('forgetracker:data/mass_report.html')
         head = []
-        for f, v in sorted(values.iteritems()):
+        for f, v in sorted(six.iteritems(values)):
             if f == 'assigned_to_id':
                 user = User.query.get(_id=v)
                 v = user.display_name if user else v
             head.append('- **%s**: %s' % (get_label(f), v))
-        for f, v in sorted(custom_values.iteritems()):
+        for f, v in sorted(six.iteritems(custom_values)):
             cf = custom_fields[f]
             if cf.type == 'user':
                 user = User.by_username(v)
@@ -515,19 +515,19 @@ class Globals(MappedClass):
     def filtered_by_subscription(self, tickets, project_id=None, app_config_id=None):
         p_id = project_id if project_id else c.project._id
         ac_id = app_config_id if app_config_id else self.app_config_id
-        ticket_ids = tickets.keys()
+        ticket_ids = list(tickets.keys())
         tickets_index_id = {
-            ticket.index_id(): t_id for t_id, ticket in tickets.iteritems()}
+            ticket.index_id(): t_id for t_id, ticket in six.iteritems(tickets)}
         subscriptions = Mailbox.query.find({
             'project_id': p_id,
             'app_config_id': ac_id,
-            'artifact_index_id': {'$in': tickets_index_id.keys() + [None]}})
+            'artifact_index_id': {'$in': list(tickets_index_id.keys()) + [None]}})
         filtered = {}
         for subscription in subscriptions:
             if subscription.artifact_index_id is None:
                 # subscribed to entire tool, will see all changes
                 filtered[subscription.user_id] = set(ticket_ids)
-            elif subscription.artifact_index_id in tickets_index_id.keys():
+            elif subscription.artifact_index_id in list(tickets_index_id.keys()):
                 user = filtered.setdefault(subscription.user_id, set())
                 user.add(tickets_index_id[subscription.artifact_index_id])
         return filtered
@@ -578,7 +578,7 @@ class TicketHistory(Snapshot):
         # `text`, so we're appending all other field values into `text`, to match on it too.
         result['text'] += '\n'.join([six.text_type(v)
                                      for k, v
-                                     in result.iteritems()
+                                     in six.iteritems(result)
                                      if k not in ('id', 'project_id_s')
                                      ])
         return result
@@ -714,7 +714,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
             votes_total_i=(self.votes_up - self.votes_down),
             import_id_s=ImportIdConverter.get().simplify(self.import_id)
         )
-        for k, v in self.custom_fields.iteritems():
+        for k, v in six.iteritems(self.custom_fields):
             # Pre solr-4.2.1 code expects all custom fields to be indexed
             # as strings.
             if not config.get_bool('new_solr'):
@@ -734,7 +734,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
         # match on it too.
         result['text'] += '\n'.join([six.text_type(v)
                                      for k, v
-                                     in result.iteritems()
+                                     in six.iteritems(result)
                                      if k not in ('id', 'project_id_s')
                                      ])
         return result
@@ -987,7 +987,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
             if 'custom_fields' not in ticket_form:
                 ticket_form['custom_fields'] = dict()
             ticket_form['custom_fields']['_milestone'] = milestone
-        for k, v in ticket_form.iteritems():
+        for k, v in six.iteritems(ticket_form):
             if k == 'assigned_to':
                 if v:
                     user = c.project.user_in_project(v)
@@ -999,7 +999,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
             else:
                 setattr(self, k, v)
         if 'custom_fields' in ticket_form:
-            for k, v in ticket_form['custom_fields'].iteritems():
+            for k, v in six.iteritems(ticket_form['custom_fields']):
                 if k in custom_users:
                     # restrict custom user field values to project members
                     user = self.app_config.project.user_in_project(v)
diff --git a/ForgeTracker/forgetracker/search.py b/ForgeTracker/forgetracker/search.py
index c4dbe1c..ca15e85 100644
--- a/ForgeTracker/forgetracker/search.py
+++ b/ForgeTracker/forgetracker/search.py
@@ -19,6 +19,7 @@ from __future__ import absolute_import
 from tg import tmpl_context as c
 
 from allura.lib.search import search
+import six
 
 
 FACET_PARAMS = {
@@ -58,7 +59,7 @@ def get_facets(solr_hit):
     """
     result = {}
     if solr_hit is not None:
-        for facet_name, values in solr_hit.facets['facet_fields'].iteritems():
+        for facet_name, values in six.iteritems(solr_hit.facets['facet_fields']):
             field_name = facet_name.rsplit('_s', 1)[0]
             values = [(values[i], values[i+1]) for i in xrange(0, len(values), 2)]
             result[field_name] = values
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 7d5b710..fe74abc 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -58,6 +58,7 @@ from allura.lib.utils import urlencode
 from allura.tests import decorators as td
 from allura.tasks import mail_tasks
 from ming.orm.ormsession import ThreadLocalORMSession
+import six
 
 
 class TrackerTestController(TestController):
@@ -84,7 +85,7 @@ class TrackerTestController(TestController):
         response = self.app.get(mount_point + 'new/',
                                 extra_environ=extra_environ)
         form = self._find_new_ticket_form(response)
-        for k, v in kw.iteritems():
+        for k, v in six.iteritems(kw):
             if type(v) == bool:
                 form['ticket_form.%s' % k] = v
             else:
@@ -1952,7 +1953,7 @@ class TestFunctionalController(TrackerTestController):
             tickets[1]._id: tickets[1],
         }
         filtered_changes = c.app.globals.filtered_by_subscription(changes)
-        filtered_users = [uid for uid, data in filtered_changes.iteritems()]
+        filtered_users = [uid for uid, data in six.iteritems(filtered_changes)]
         assert_equal(sorted(filtered_users),
                      sorted([u._id for u in users[:-1] + [admin]]))
         ticket_ids = [t._id for t in tickets]
@@ -2298,7 +2299,7 @@ class TestFunctionalController(TrackerTestController):
         r = self.app.get('/p/test/bugs/2/')
         field_name = None  # comment text textarea name
         form = r.forms['ticket-form']
-        for name, field in form.fields.iteritems():
+        for name, field in six.iteritems(form.fields):
             if field[0].tag == 'textarea':
                 field_name = name
         assert field_name, "Can't find comment field"
@@ -2405,7 +2406,7 @@ class TestFunctionalController(TrackerTestController):
         r = self.app.get('/p/test/bugs/1/')
         field_name = None  # comment text textarea name
         form = r.forms['ticket-form']
-        for name, field in form.fields.iteritems():
+        for name, field in six.iteritems(form.fields):
             if field[0].tag == 'textarea':
                 field_name = name
         assert field_name, "Can't find comment field"
@@ -2619,7 +2620,7 @@ class TestMilestoneAdmin(TrackerTestController):
                  show_in_search='on',
                  type='milestone',
                  milestones=[
-                     dict((k, v) for k, v in d.iteritems()) for d in mf['milestones']])
+                     dict((k, v) for k, v in six.iteritems(d)) for d in mf['milestones']])
             for mf in milestones]}
         return self._post(params)
 
diff --git a/ForgeTracker/forgetracker/tests/test_app.py b/ForgeTracker/forgetracker/tests/test_app.py
index d902a8d..f1cfd2f 100644
--- a/ForgeTracker/forgetracker/tests/test_app.py
+++ b/ForgeTracker/forgetracker/tests/test_app.py
@@ -127,7 +127,7 @@ class TestBulkExport(TrackerTestController):
         assert_equal(posts_foo[0]['text'], 'silly comment')
 
         tracker_config = tracker['tracker_config']
-        assert_true('options' in tracker_config.keys())
+        assert_true('options' in list(tracker_config.keys()))
         assert_equal(tracker_config['options']['mount_point'], 'bugs')
 
         milestones = sorted(tracker['milestones'],
diff --git a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
index 68d10d4..149cc8a 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
@@ -332,7 +332,7 @@ class TestTicketModel(TrackerTestWithModel):
 
     def test_json_parents(self):
         ticket = Ticket.new()
-        json_keys = ticket.__json__().keys()
+        json_keys = list(ticket.__json__().keys())
         assert_in('related_artifacts', json_keys)  # from Artifact
         assert_in('votes_up', json_keys)  # VotableArtifact
         assert_in('ticket_num', json_keys)  # Ticket
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 42516c7..c39b54f 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -83,6 +83,7 @@ from forgetracker.widgets.ticket_form import TicketForm, TicketCustomField
 from forgetracker.widgets.bin_form import BinForm
 from forgetracker.widgets.ticket_search import TicketSearchResults, MassEdit, MassEditForm, MassMoveForm
 from forgetracker.widgets.admin_custom_fields import TrackerFieldAdmin, TrackerFieldDisplay
+import six
 
 log = logging.getLogger(__name__)
 
@@ -1696,7 +1697,7 @@ class TrackerAdminController(DefaultAdminController):
     @validate(W.options_admin, error_handler=options)
     def set_options(self, **kw):
         require_access(self.app, 'configure')
-        for k, v in kw.iteritems():
+        for k, v in six.iteritems(kw):
             self.app.config.options[k] = v
         flash('Options updated')
         redirect(request.referer or '/')
diff --git a/ForgeTracker/forgetracker/widgets/ticket_search.py b/ForgeTracker/forgetracker/widgets/ticket_search.py
index 44bc9da..ba0be4d 100644
--- a/ForgeTracker/forgetracker/widgets/ticket_search.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_search.py
@@ -22,6 +22,7 @@ import ew.jinja2_ew as ew
 
 from allura.lib.widgets import form_fields as ffw
 from allura.lib.widgets import forms
+import six
 
 
 
@@ -47,7 +48,7 @@ class TicketSearchResults(ew_core.SimpleForm):
     def __init__(self, filters, *args, **kw):
         super(TicketSearchResults, self).__init__(*args, **kw)
         self.filters = {}
-        for name, field in filters.iteritems():
+        for name, field in six.iteritems(filters):
             self.filters[name] = options = [{
                 'value': val,
                 'label': '%s (%s)' % (val, count),
diff --git a/ForgeUserStats/forgeuserstats/controllers/userstats.py b/ForgeUserStats/forgeuserstats/controllers/userstats.py
index f151145..aa4e199 100644
--- a/ForgeUserStats/forgeuserstats/controllers/userstats.py
+++ b/ForgeUserStats/forgeuserstats/controllers/userstats.py
@@ -135,7 +135,7 @@ class ForgeUserStatsController(BaseController):
                     categories[cat] += 1
                 else:
                     categories[cat] = 1
-        categories = sorted(categories.items(),
+        categories = sorted(list(categories.items()),
                             key=lambda (x, y): y, reverse=True)
 
         ret_dict['lastmonth_logins'] = stats.getLastMonthLogins()
diff --git a/ForgeWiki/forgewiki/model/wiki.py b/ForgeWiki/forgewiki/model/wiki.py
index ef081d1..0a7c33b 100644
--- a/ForgeWiki/forgewiki/model/wiki.py
+++ b/ForgeWiki/forgewiki/model/wiki.py
@@ -258,7 +258,7 @@ class Page(VersionedArtifact, ActivityObject):
             t = {}
             for user in users:
                 t[user.username] = user.id
-            return t.values()
+            return list(t.values())
         user_ids = uniq([r.author for r in self.history().all()])
         return User.query.find({
             '_id': {'$in': user_ids},
diff --git a/fuse/accessfs.py b/fuse/accessfs.py
index a319544..ee19ba1 100644
--- a/fuse/accessfs.py
+++ b/fuse/accessfs.py
@@ -35,6 +35,7 @@ from threading import Lock
 from collections import deque
 
 import fuse
+import six
 
 log = logging.getLogger(__name__)
 
@@ -56,7 +57,7 @@ class check_access(object):
             new_kwargs = dict(kwargs)
             for i, (mode, path) in enumerate(zip(self._args, args)):
                 new_args[i] = self.check(inst, path, mode)
-            for name, mode in self._kwargs.iteritems():
+            for name, mode in six.iteritems(self._kwargs):
                 new_kwargs[name] = self.check(inst, kwargs.get(name), mode)
             return func(inst, *new_args, **new_kwargs)
         return wrapper
diff --git a/scripts/perf/benchmark-scm.py b/scripts/perf/benchmark-scm.py
index 717da23..341beb9 100755
--- a/scripts/perf/benchmark-scm.py
+++ b/scripts/perf/benchmark-scm.py
@@ -46,8 +46,8 @@ def main(opts):
         repo = hg.repository(HgUI(), six.ensure_str(opts.repo_path))
         cid = None if opts.cid == 'HEAD' else ['%s:0' % opts.cid]
         path = opts.path.strip('/')
-        filenames = repo[
-            'tip' if opts.cid == 'HEAD' else opts.cid].manifest().keys()
+        filenames = list(repo[
+            'tip' if opts.cid == 'HEAD' else opts.cid].manifest().keys())
         filenames = [
             name for name in filenames if name.startswith(('%s/' % path).lstrip('/'))]
         names = set()
diff --git a/scripts/project-import.py b/scripts/project-import.py
index 3edb71b..2ca0f23 100644
--- a/scripts/project-import.py
+++ b/scripts/project-import.py
@@ -33,6 +33,7 @@ from tg import tmpl_context as c, app_globals as g
 from allura import model as M
 from allura.lib import helpers as h
 from allura.lib.plugin import ProjectRegistrationProvider
+import six
 
 log = logging.getLogger(__name__)
 
@@ -242,12 +243,12 @@ def create_project(p, nbhd, options):
     project.notifications_disabled = True
 
     if options.ensure_tools and 'tools' in project_template:
-        for i, tool in enumerate(project_template['tools'].iterkeys()):
+        for i, tool in enumerate(six.iterkeys(project_template['tools'])):
             tool_config = project_template['tools'][tool]
             if project.app_instance(tool_config['mount_point']):
                 continue
             tool_options = tool_config.get('options', {})
-            for k, v in tool_options.iteritems():
+            for k, v in six.iteritems(tool_options):
                 if isinstance(v, basestring):
                     tool_options[k] = string.Template(v).safe_substitute(
                         project.root_project.__dict__.get('root_project', {}))
diff --git a/scripts/teamforge-import.py b/scripts/teamforge-import.py
index 7d001c6..8c2ba90 100644
--- a/scripts/teamforge-import.py
+++ b/scripts/teamforge-import.py
@@ -864,7 +864,7 @@ def get_homepage_wiki(project):
             download_file('wiki', img_url, project.id,
                           'wiki', 'homepage', filename)
 
-    for path, text in pages.iteritems():
+    for path, text in six.iteritems(pages):
         if options.default_wiki_text in text:
             log.debug('skipping default wiki page %s' % path)
         else:
@@ -1078,7 +1078,7 @@ def test_make_valid_sf_username():
         'u012345678901234567890': 'u0123456789-mmi',
         'foo^213': 'foo213-mmi'
     }
-    for k, v in tests.iteritems():
+    for k, v in six.iteritems(tests):
         assert make_valid_sf_username(k) == v
 
 
diff --git a/scripts/trac_import.py b/scripts/trac_import.py
index fda168b..10db3cf 100644
--- a/scripts/trac_import.py
+++ b/scripts/trac_import.py
@@ -23,6 +23,7 @@ from optparse import OptionParser
 
 from allura.lib.import_api import AlluraImportApiClient
 from tracwikiimporter.scripts.wiki_from_trac.loaders import import_wiki
+import six
 
 
 def main():
@@ -42,7 +43,7 @@ def main():
             user_map = json.load(f)
             if type(user_map) is not type({}):
                 raise ValueError
-            for k, v in user_map.iteritems():
+            for k, v in six.iteritems(user_map):
                 print(k, v)
                 if not isinstance(k, basestring) or not isinstance(v, basestring):
                     raise ValueError