From: W. Trevor King <wking@drexel.edu>
Date: Tue, 8 Nov 2011 12:14:43 +0000 (-0500)
Subject: Correct doc/install.txt to refer to INSTALL_OPTIONS instead of PREFIX.
X-Git-Tag: 1.1.0~175^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1512c0e2a64e;p=be.git

Correct doc/install.txt to refer to INSTALL_OPTIONS instead of PREFIX.

This catches the docs up with the changes made in:
  commit a7ad89a6ad7da55089e6f9a4cdd645b7079ee04e
  Author: W. Trevor King <wking@drexel.edu>
  Date:   Sat Apr 16 21:26:02 2011 -0400
---

diff --git a/doc/install.txt b/doc/install.txt
index fd2bcaf..bd82ee6 100644
--- a/doc/install.txt
+++ b/doc/install.txt
@@ -41,8 +41,8 @@ to build some auto-generated files (e.g. :mod:`libbe._version`), and::
     $ make install
 
 to install BE.  By default BE will install into your home directory,
-but you can tweak the ``PREFIX`` variable in ``Makefile`` to install
-to another location.
+but you can tweak the ``INSTALL_OPTIONS`` variable in ``Makefile`` to
+install to another location.
 
 By default, ``make`` builds both a man page for ``be`` and the HTML
 Sphinx documentation (:doc:`doc`).  You can customize the
diff --git a/libbe/util/encoding.py b/libbe/util/encoding.py
index 77d62fc..8663744 100644
--- a/libbe/util/encoding.py
+++ b/libbe/util/encoding.py
@@ -51,14 +51,10 @@ def get_input_encoding():
 def get_output_encoding():
     return sys.__stdout__.encoding or get_encoding()
 
-def get_filesystem_encoding():
+def get_text_file_encoding():
     """Return the encoding that should be used for file contents
-
-    Note that `sys.getfilesystemencoding` returns the prefered
-    encoding for file *names*, and we're assuming that this is also
-    the prefered encoding for their contents.
     """
-    return sys.getfilesystemencoding() or get_encoding()
+    return 'utf-8'
 
 def get_argv_encoding():
     return get_encoding()