diff options
| author | Holger Weiß <holger@zedat.fu-berlin.de> | 2011-06-06 17:06:16 +0200 |
|---|---|---|
| committer | Holger Weiß <holger@zedat.fu-berlin.de> | 2011-06-06 17:06:16 +0200 |
| commit | 8c497c815589c7c5878490df7661c6f5d3330829 (patch) | |
| tree | 4f120fa75ace45cdf78fd44b1852694d004eb7ac /src/lib/Client/Frame.py | |
| parent | 3914d14bec1cb7c0f6a600ea8d04ee0e6abc6550 (diff) | |
| download | bcfg2-8c497c815589c7c5878490df7661c6f5d3330829.tar.gz bcfg2-8c497c815589c7c5878490df7661c6f5d3330829.tar.bz2 bcfg2-8c497c815589c7c5878490df7661c6f5d3330829.zip | |
Create non-ASCII diffs
The client now also transmits diffs of files which include non-US-ASCII
data (using the encoding setting from Options.py), unless they look like
binary files. In the past, non-ASCII files were transmitted as Base64
blobs.
In addition, "bcfg2 -I" no longer refuses to display non-ASCII diffs.
Resolves ticket #999.
Diffstat (limited to 'src/lib/Client/Frame.py')
| -rw-r--r-- | src/lib/Client/Frame.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py index 60d158eb1..57844ab19 100644 --- a/src/lib/Client/Frame.py +++ b/src/lib/Client/Frame.py @@ -5,6 +5,7 @@ installs entries, and generates statistics. __revision__ = '$Revision$' import logging +import sys import time import Bcfg2.Client.Tools @@ -29,7 +30,7 @@ def promptFilter(prompt, entries): try: # py3k compatibility try: - ans = raw_input(iprompt) + ans = raw_input(iprompt.encode(sys.stdout.encoding, 'replace')) except NameError: ans = input(iprompt) if ans in ['y', 'Y']: |