From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Fri, 6 Jul 2012 14:03:08 +0000 (-0500)
Subject: Removing _jointhat()... not really needed.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1ec85bb3de52ed67af176b76f0eda29df78c2193;p=mediagoblin.git

Removing _jointhat()... not really needed.
---

diff --git a/mediagoblin/tools/files.py b/mediagoblin/tools/files.py
index 0e8dc1e9..315ff5e0 100644
--- a/mediagoblin/tools/files.py
+++ b/mediagoblin/tools/files.py
@@ -16,18 +16,6 @@
 
 from mediagoblin import mg_globals
 
-import os
-
-def _jointhat(thing):
-    if type(thing) == type(list()) or\
-            type(thing) == type(tuple()):
-        filepath = ""
-        for item in thing:
-            filepath = os.path.join(filepath, item)
-        return filepath
-    else:
-        raise TypeError, "expecting a list or tuple, {0} received".format(
-            str(type(thing)))
 
 def delete_media_files(media):
     """
@@ -42,14 +30,14 @@ def delete_media_files(media):
             mg_globals.public_store.delete_file(
                 listpath)
         except OSError:
-            no_such_files.append(_jointhat(listpath))
+            no_such_files.append("/".join(listpath))
 
     for attachment in media.attachment_files:
         try:
             mg_globals.public_store.delete_file(
                 attachment['filepath'])
         except OSError:
-            no_such_files.append(_jointhat(attachment))
+            no_such_files.append("/".join(attachment))
 
     if no_such_files:
         # This breaks pep8 as far as I know