diff options
| author | W. Trevor King <wking@drexel.edu> | 2011-11-13 21:06:43 -0500 |
|---|---|---|
| committer | W. Trevor King <wking@drexel.edu> | 2011-11-13 21:06:43 -0500 |
| commit | 6f2d652b2697d7aec6bb48a2bf4d6fff1ef03521 (patch) | |
| tree | 4b6e99206fcc0e810172104230246684ae6cac36 /libbe/storage | |
| parent | 567c3151cab38140eb40eb2b0a08ba0c2ac6ec89 (diff) | |
| download | bugseverywhere-6f2d652b2697d7aec6bb48a2bf4d6fff1ef03521.tar.gz | |
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 <wking@drexel.edu>
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.
Diffstat (limited to 'libbe/storage')
| -rw-r--r-- | libbe/storage/util/config.py | 4 | ||||
| -rw-r--r-- | libbe/storage/vcs/base.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libbe/storage/util/config.py b/libbe/storage/util/config.py index 714d4e7..d138bf4 100644 --- a/libbe/storage/util/config.py +++ b/libbe/storage/util/config.py @@ -31,10 +31,10 @@ if libbe.TESTING == True: import doctest -default_encoding = libbe.util.encoding.get_filesystem_encoding() +default_encoding = libbe.util.encoding.get_text_file_encoding() """Default filesystem encoding. -Initialized with :func:`libbe.util.encoding.get_filesystem_encoding`. +Initialized with :func:`libbe.util.encoding.get_text_file_encoding`. """ def path(): diff --git a/libbe/storage/vcs/base.py b/libbe/storage/vcs/base.py index 22874a5..eaaf2d8 100644 --- a/libbe/storage/vcs/base.py +++ b/libbe/storage/vcs/base.py @@ -199,7 +199,7 @@ class CachedPathID (object): >>> dir.cleanup() """ def __init__(self, encoding=None): - self.encoding = libbe.util.encoding.get_filesystem_encoding() + self.encoding = libbe.util.encoding.get_text_file_encoding() self._spacer_dirs = ['.be', 'bugs', 'comments'] def root(self, path): @@ -350,7 +350,7 @@ class VCS (libbe.storage.base.VersionedStorage): def __init__(self, *args, **kwargs): if 'encoding' not in kwargs: - kwargs['encoding'] = libbe.util.encoding.get_filesystem_encoding() + kwargs['encoding'] = libbe.util.encoding.get_text_file_encoding() libbe.storage.base.VersionedStorage.__init__(self, *args, **kwargs) self.versioned = False self.interspersed_vcs_files = False |