4 files changed, 5 insertions, 22 deletions
diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py
index 6b3639e8..50f1aabf 100644
--- a/mediagoblin/tools/exif.py
+++ b/mediagoblin/tools/exif.py
@@ -14,10 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-try:
-    from EXIF import process_file, Ratio
-except ImportError:
-    from mediagoblin.tools.extlib.EXIF import process_file, Ratio
+from exifread import process_file
+from exifread.utils import Ratio
 
 from mediagoblin.processing import BadMediaFail
 from mediagoblin.tools.translate import pass_to_ugettext as _
diff --git a/mediagoblin/tools/extlib/EXIF.py b/mediagoblin/tools/extlib/EXIF.py
deleted file mode 120000
index 82a2fb30..00000000
--- a/mediagoblin/tools/extlib/EXIF.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../extlib/exif/EXIF.py
-\ No newline at end of file
diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py
index f55ce349..257bd791 100644
--- a/mediagoblin/tools/translate.py
+++ b/mediagoblin/tools/translate.py
@@ -42,7 +42,7 @@ def set_available_locales():
     """Set available locales for which we have translations"""
     global AVAILABLE_LOCALES
     locales=['en', 'en_US'] # these are available without translations
-    for locale in localedata.list():
+    for locale in localedata.locale_identifiers():
         if gettext.find('mediagoblin', TRANSLATIONS_PATH, [locale]):
             locales.append(locale)
     AVAILABLE_LOCALES = locales
diff --git a/mediagoblin/tools/url.py b/mediagoblin/tools/url.py
index d9179f9e..657c0373 100644
--- a/mediagoblin/tools/url.py
+++ b/mediagoblin/tools/url.py
@@ -15,15 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
-# This import *is* used; see word.encode('tranlit/long') below.
-from unicodedata import normalize
-
-try:
-    import translitcodec
-    USING_TRANSLITCODEC = True
-except ImportError:
-    USING_TRANSLITCODEC = False
-
+from unidecode import unidecode
 
 _punct_re = re.compile(r'[\t !"#:$%&\'()*\-/<=>?@\[\\\]^_`{|},.]+')
 
@@ -34,11 +26,5 @@ def slugify(text, delim=u'-'):
     """
     result = []
     for word in _punct_re.split(text.lower()):
-        if USING_TRANSLITCODEC:
-            word = word.encode('translit/long')
-        else:
-            word = normalize('NFKD', word).encode('ascii', 'ignore')
-
-        if word:
-            result.append(word)
+        result.extend(unidecode(word).split())
     return unicode(delim.join(result))