From 37cf398b9da85f6121aaaeac374ae01f2ab2f858 Mon Sep 17 00:00:00 2001 From: ndparker Date: Sun, 2 Nov 2014 00:14:32 +0100 Subject: [PATCH] try fixing the issue presented in https://github.com/ndparker/rjsmin/pull/2 --- py3/dev/apidoc.py | 4 ++-- py3/ext.py | 2 +- py3/make/default_targets.py | 2 +- py3/make/targets.py | 8 ++++---- py3/setup.py | 12 ++++++------ py3/shell.py | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/py3/dev/apidoc.py b/py3/dev/apidoc.py index c1057eb..ef4d62f 100644 --- a/py3/dev/apidoc.py +++ b/py3/dev/apidoc.py @@ -41,7 +41,7 @@ def _cleanup_epydoc(target): """ search = _re.compile(r']+width="100%%"').search for filename in _shell.files(target, '*.html'): - fp = open(filename, 'r') + fp = open(filename, 'r', encoding='latin-1') try: html = fp.read() finally: @@ -53,7 +53,7 @@ def _cleanup_epydoc(target): if end >= 0: end += len('') + 1 html = html[:start] + html[end:] - fp = open(filename, 'w') + fp = open(filename, 'w', encoding='latin-1') try: fp.write(html) finally: diff --git a/py3/ext.py b/py3/ext.py index c54c845..852c466 100644 --- a/py3/ext.py +++ b/py3/ext.py @@ -179,7 +179,7 @@ def __init__(self, build, source): """ self._tempdir = tempdir = _tempfile.mkdtemp() src = _os.path.join(tempdir, 'conftest.c') - fp = open(src, 'w') + fp = open(src, 'w', encoding='utf-8') try: fp.write(source) finally: diff --git a/py3/make/default_targets.py b/py3/make/default_targets.py index 16c95ee..9c74aa9 100644 --- a/py3/make/default_targets.py +++ b/py3/make/default_targets.py @@ -63,7 +63,7 @@ def decorate(line, prefix='# ', width=78, char='~', padding=' '): names.append(name) names.sort() - fp = open(_shell.native('Makefile'), 'w') + fp = open(_shell.native('Makefile'), 'w', encoding='utf-8') print(decorate("Generated Makefile, DO NOT EDIT"), file=fp) print(decorate("python %s %s" % ( _os.path.basename(script), self.NAME diff --git a/py3/make/targets.py b/py3/make/targets.py index eca4d02..4620e2f 100644 --- a/py3/make/targets.py +++ b/py3/make/targets.py @@ -187,7 +187,7 @@ def do_digest(self, hashfunc, name, filename): return sig.hexdigest() param = {'sig': sig.hexdigest(), 'file': _os.path.basename(filename)} - fp = open("%s.%s" % (filename, name), "w") + fp = open("%s.%s" % (filename, name), "w", encoding='utf-8') fp.write("%(sig)s *%(file)s\n" % param) fp.close() @@ -265,9 +265,9 @@ def sign(self, filename, detach=True): sig.seek(0, 0) if detach: - open("%s.asc" % filename, "w").write(sig.read()) + open("%s.asc" % filename, "w", encoding='utf-8').write(sig.read()) else: - open(filename, "w").write(sig.read()) + open(filename, "w", encoding='utf-8').write(sig.read()) return True @@ -309,7 +309,7 @@ class Manifest(_make.Target): def run(self): _term.green("Creating %(name)s...", name=self.NAME) dest = _shell.native(self.NAME) - dest = open(dest, 'w') + dest = open(dest, 'w', encoding='utf-8') for name in self.manifest_names(): dest.write("%s\n" % name) dest.close() diff --git a/py3/setup.py b/py3/setup.py index e28f000..83f1c21 100644 --- a/py3/setup.py +++ b/py3/setup.py @@ -88,7 +88,7 @@ def find_description(docs): summary = None filename = docs.get('meta.summary', 'SUMMARY').strip() if filename and _os.path.isfile(filename): - fp = open(filename) + fp = open(filename, encoding='utf-8') try: try: summary = fp.read().strip().splitlines()[0].rstrip() @@ -100,7 +100,7 @@ def find_description(docs): description = None filename = docs.get('meta.description', 'DESCRIPTION').strip() if filename and _os.path.isfile(filename): - fp = open(filename) + fp = open(filename, encoding='utf-8') try: description = fp.read().rstrip() finally: @@ -126,7 +126,7 @@ def find_classifiers(docs): """ filename = docs.get('meta.classifiers', 'CLASSIFIERS').strip() if filename and _os.path.isfile(filename): - fp = open(filename) + fp = open(filename, encoding='utf-8') try: content = fp.read() finally: @@ -145,7 +145,7 @@ def find_provides(docs): """ filename = docs.get('meta.provides', 'PROVIDES').strip() if filename and _os.path.isfile(filename): - fp = open(filename) + fp = open(filename, encoding='utf-8') try: content = fp.read() finally: @@ -164,7 +164,7 @@ def find_license(docs): """ filename = docs.get('meta.license', 'LICENSE').strip() if filename and _os.path.isfile(filename): - fp = open(filename) + fp = open(filename, encoding='utf-8') try: return fp.read().rstrip() finally: @@ -339,7 +339,7 @@ def run(config=('package.cfg',), ext=None, script_args=None, manifest_only=0): ext = [] cfg = _util.SafeConfigParser() - cfg.read(config) + cfg.read(config, encoding='utf-8') pkg = dict(cfg.items('package')) python_min = pkg.get('python.min') or None python_max = pkg.get('python.max') or None diff --git a/py3/shell.py b/py3/shell.py index a40c85c..91f2ebc 100644 --- a/py3/shell.py +++ b/py3/shell.py @@ -204,7 +204,7 @@ def _filepipespawn(infile, outfile, argv, env): 'outfile': repr(_pickle.dumps(_os.path.abspath(outfile))), 'argv': repr(_pickle.dumps(argv)), 'env': repr(_pickle.dumps(env)), - })) + }).encode('utf-8')) fd, _ = None, _os.close(fd) if _sys.platform == 'win32': argv = []