diff --git a/galaxy/api/views/notification.py b/galaxy/api/views/notification.py
index 4dbca9e14..22319af69 100644
--- a/galaxy/api/views/notification.py
+++ b/galaxy/api/views/notification.py
@@ -3,9 +3,9 @@
 import logging
 
 from hashlib import sha256
-from urlparse import urlparse
-
 import requests
+from six.moves.urllib import parse as urlparse
+
 from OpenSSL import crypto
 from django.conf import settings
 from django.db import IntegrityError
diff --git a/galaxy/importer/utils/git.py b/galaxy/importer/utils/git.py
index 4bbd36cee..985f09194 100644
--- a/galaxy/importer/utils/git.py
+++ b/galaxy/importer/utils/git.py
@@ -56,6 +56,7 @@ def make_clone_dir(basedir=None):
             # Note(cutwater): Suppress exception if directory
             # has been deleted already.
             if e.errno != errno.ENOENT:
+                # noinspection PyCompatibility
                 raise
 
 
diff --git a/galaxy/main/mixins.py b/galaxy/main/mixins.py
index 03c023976..8115cd59c 100644
--- a/galaxy/main/mixins.py
+++ b/galaxy/main/mixins.py
@@ -15,6 +15,9 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
+import six
+
+
 __all__ = ['DirtyMixin']
 
 
@@ -29,7 +32,7 @@ def __init__(self, *args, **kwargs):
     @property
     def is_dirty(self):
         missing = object()
-        for key, value in self._original_state.iteritems():
+        for key, value in six.iteritems(self._original_state):
             if value != self.__dict__.get(key, missing):
                 return True
         return False