From 5ab9191826fb7b6d24abdfef9c0ef701f1b15f2a Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Fri, 18 Jan 2013 13:47:39 +0000
Subject: make distinction between file filter and file suffix; use endswith builtin

---
(limited to 'TurtleArt')

diff --git a/TurtleArt/tautils.py b/TurtleArt/tautils.py
index 5f1635b..6da36cc 100644
--- a/TurtleArt/tautils.py
+++ b/TurtleArt/tautils.py
@@ -44,7 +44,7 @@ except (ImportError, AttributeError):
 from StringIO import StringIO
 
 from taconstants import (HIT_HIDE, HIT_SHOW, XO1, XO15, XO175, XO30, XO4,
-                         UNKNOWN, MAGICNUMBER)
+                         UNKNOWN, MAGICNUMBER, SUFFIX)
 
 import logging
 _logger = logging.getLogger('turtleart-activity')
@@ -191,17 +191,17 @@ def json_dump(data):
         return io.getvalue()
 
 
-def get_load_name(suffix, load_save_folder):
+def get_load_name(filefilter, load_save_folder):
     ''' Open a load file dialog. '''
     dialog = gtk.FileChooserDialog(
         _('Load...'), None,
         gtk.FILE_CHOOSER_ACTION_OPEN, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
                                        gtk.STOCK_OPEN, gtk.RESPONSE_OK))
     dialog.set_default_response(gtk.RESPONSE_OK)
-    return do_dialog(dialog, suffix, load_save_folder)
+    return do_dialog(dialog, filefilter, load_save_folder)
 
 
-def get_save_name(suffix, load_save_folder, save_file_name):
+def get_save_name(filefilter, load_save_folder, save_file_name):
     ''' Open a save file dialog. '''
     dialog = gtk.FileChooserDialog(
         _('Save...'), None,
@@ -209,8 +209,10 @@ def get_save_name(suffix, load_save_folder, save_file_name):
                                        gtk.STOCK_SAVE, gtk.RESPONSE_OK))
     dialog.set_default_response(gtk.RESPONSE_OK)
     if save_file_name is not None:
-        dialog.set_current_name(save_file_name + suffix)
-    return do_dialog(dialog, suffix, load_save_folder)
+        if not save_file_name.endswith(SUFFIX):
+            save_file_name = save_file_name + SUFFIX[1]
+        dialog.set_current_name(save_file_name)
+    return do_dialog(dialog, filefilter, load_save_folder)
 
 
 def chooser(parent_window, filter, action):
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index ba072f6..49b56da 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -3401,7 +3401,7 @@ may not terminate.', False)
                                                      self.load_save_folder)
         if _file_name is None:
             return
-        if not _file_name[-3:] in SUFFIX:
+        if not file_name.endswith(SUFFIX):
             _file_name = _file_name + SUFFIX[1]
         self.load_files(_file_name, create_new_project)
         if create_new_project:
@@ -3707,7 +3707,7 @@ may not terminate.', False)
                 '.t[a-b]', self.load_save_folder, self.save_file_name)
         if file_name is None:
             return
-        if not file_name[-3:] in  SUFFIX:
+        if not file_name.endswith(SUFFIX):
             file_name = file_name +  SUFFIX[1]
         data_to_file(self.assemble_data_to_save(), file_name)
         self.save_file_name = os.path.basename(file_name)
@@ -3854,7 +3854,7 @@ may not terminate.', False)
 
     def save_for_upload(self, file_name):
         ''' Grab the current canvas and save it for upload '''
-        if not file_name[-3:] in SUFFIX:
+        if not file_name.endswith(SUFFIX):
             ta_name = file_name + SUFFIX[1]
             image_file = file_name + '.png'
         else:
--
cgit v0.9.1