From 6f2d652b2697d7aec6bb48a2bf4d6fff1ef03521 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sun, 13 Nov 2011 21:06:43 -0500 Subject: Fix my busted 1512c0e2a64e patch to libbe/util/encoding.py. Some temporary changes to encoding.py seem to have been added to commit 1512c0e2a64e19c8d4e5697257a4df5ddd8bc727 Author: W. Trevor King Date: Tue Nov 8 07:14:43 2011 -0500 by accident. The initial change came from discussions with Niall Douglas, during which I realized that "filesystem encoding" ususally means the encoding for the *path*, not the *contents*. To avoid further confusion I'd renamed `get_filesystem_encoding` to the less ambiguous `get_text_file_encoding`. This commit should complete the transition. --- libbe/ui/util/editor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libbe/ui/util/editor.py') diff --git a/libbe/ui/util/editor.py b/libbe/ui/util/editor.py index 206e9c4..fb51159 100644 --- a/libbe/ui/util/editor.py +++ b/libbe/ui/util/editor.py @@ -65,7 +65,7 @@ def editor_string(comment=None, encoding=None): >>> del os.environ["VISUAL"] """ if encoding == None: - encoding = libbe.util.encoding.get_filesystem_encoding() + encoding = libbe.util.encoding.get_text_file_encoding() editor = None for name in ('VISUAL', 'EDITOR'): if name in os.environ and os.environ[name] != '': -- cgit