[gedit] Fix environment for tabstop env defaults

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 037361196231faf4ec5caa2be16b9a2441090c7c
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Mon Jan 30 13:43:59 2012 +0100

    Fix environment for tabstop env defaults

 plugins/snippets/snippets/placeholder.py |    9 +++++----
 plugins/snippets/snippets/snippet.py     |    4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/plugins/snippets/snippets/placeholder.py b/plugins/snippets/snippets/placeholder.py
index c9d6ec7..5fc95f1 100644
--- a/plugins/snippets/snippets/placeholder.py
+++ b/plugins/snippets/snippets/placeholder.py
@@ -39,11 +39,10 @@ class Placeholder:
                 self.mirrors = []
                 self.leave_mirrors = []
                 self.tabstop = tabstop
+                self.environ = environ
                 self.set_default(defaults)
                 self.prev_contents = self.default
                 self.set_mark_gravity()
-                self.environ = environ
-                self.envkey = 'utf8'
 
                 if begin:
                         self.begin = self.buf.create_mark(None, begin, self.mark_gravity[0])
@@ -53,7 +52,7 @@ class Placeholder:
                 self.end = None
 
         def get_environ(self):
-                return self.environ[self.envkey]
+                return self.environ['utf8']
 
         def __str__(self):
                 return '%s (%s)' % (str(self.__class__), str(self.default))
@@ -392,7 +391,9 @@ class PlaceholderShell(PlaceholderExpand):
 
                 self.shell = None
                 self.remove_me = False
-                self.envkey = 'noenc'
+
+        def get_environ(self):
+                return self.environ['noenc']
 
         def close_shell(self):
                 self.shell.stdout.close()
diff --git a/plugins/snippets/snippets/snippet.py b/plugins/snippets/snippets/snippet.py
index a036abb..c3afeba 100644
--- a/plugins/snippets/snippets/snippet.py
+++ b/plugins/snippets/snippets/snippet.py
@@ -243,8 +243,8 @@ class Snippet:
                                        'eval': self._create_eval,
                                        'regex': self._create_regex,
                                        'text': self._create_text}[token.klass](token.data)
-                        except:
-                                sys.stderr.write('Token class not supported: %s\n' % token.klass)
+                        except KeyError:
+                                sys.stderr.write('Token class not supported: %s (%s)\n' % token.klass)
                                 continue
 
                         if isinstance(val, basestring):