Commit 8ad431d5 authored by Walter Dörwald's avatar Walter Dörwald

Use basestring instead of type.StringType for checking whether a input

or output file is a file name instead of a file object. This enables
unicode file names as arguments to uu.encode() and uu.decode().
parent cad490f1
...@@ -33,7 +33,6 @@ decode(in_file [, out_file, mode]) ...@@ -33,7 +33,6 @@ decode(in_file [, out_file, mode])
import binascii import binascii
import os import os
import sys import sys
from types import StringType
__all__ = ["Error", "encode", "decode"] __all__ = ["Error", "encode", "decode"]
...@@ -47,7 +46,7 @@ def encode(in_file, out_file, name=None, mode=None): ...@@ -47,7 +46,7 @@ def encode(in_file, out_file, name=None, mode=None):
# #
if in_file == '-': if in_file == '-':
in_file = sys.stdin in_file = sys.stdin
elif isinstance(in_file, StringType): elif isinstance(in_file, basestring):
if name is None: if name is None:
name = os.path.basename(in_file) name = os.path.basename(in_file)
if mode is None: if mode is None:
...@@ -61,7 +60,7 @@ def encode(in_file, out_file, name=None, mode=None): ...@@ -61,7 +60,7 @@ def encode(in_file, out_file, name=None, mode=None):
# #
if out_file == '-': if out_file == '-':
out_file = sys.stdout out_file = sys.stdout
elif isinstance(out_file, StringType): elif isinstance(out_file, basestring):
out_file = open(out_file, 'w') out_file = open(out_file, 'w')
# #
# Set defaults for name and mode # Set defaults for name and mode
...@@ -88,7 +87,7 @@ def decode(in_file, out_file=None, mode=None, quiet=0): ...@@ -88,7 +87,7 @@ def decode(in_file, out_file=None, mode=None, quiet=0):
# #
if in_file == '-': if in_file == '-':
in_file = sys.stdin in_file = sys.stdin
elif isinstance(in_file, StringType): elif isinstance(in_file, basestring):
in_file = open(in_file) in_file = open(in_file)
# #
# Read until a begin is encountered or we've exhausted the file # Read until a begin is encountered or we've exhausted the file
...@@ -117,7 +116,7 @@ def decode(in_file, out_file=None, mode=None, quiet=0): ...@@ -117,7 +116,7 @@ def decode(in_file, out_file=None, mode=None, quiet=0):
# #
if out_file == '-': if out_file == '-':
out_file = sys.stdout out_file = sys.stdout
elif isinstance(out_file, StringType): elif isinstance(out_file, basestring):
fp = open(out_file, 'wb') fp = open(out_file, 'wb')
try: try:
os.path.chmod(out_file, mode) os.path.chmod(out_file, mode)
...@@ -172,7 +171,7 @@ def test(): ...@@ -172,7 +171,7 @@ def test():
if dopt: if dopt:
if topt: if topt:
if isinstance(output, StringType): if isinstance(output, basestring):
output = open(output, 'w') output = open(output, 'w')
else: else:
print sys.argv[0], ': cannot do -t to stdout' print sys.argv[0], ': cannot do -t to stdout'
...@@ -180,7 +179,7 @@ def test(): ...@@ -180,7 +179,7 @@ def test():
decode(input, output) decode(input, output)
else: else:
if topt: if topt:
if isinstance(input, StringType): if isinstance(input, basestring):
input = open(input, 'r') input = open(input, 'r')
else: else:
print sys.argv[0], ': cannot do -t from stdin' print sys.argv[0], ': cannot do -t from stdin'
......
...@@ -551,6 +551,8 @@ Library ...@@ -551,6 +551,8 @@ Library
- Bug #1245379: Add "unicode-1-1-utf-7" as an alias for "utf-7" to - Bug #1245379: Add "unicode-1-1-utf-7" as an alias for "utf-7" to
``encodings.aliases``. ``encodings.aliases``.
- ` uu.encode()`` and ``uu.decode()`` now support unicode filenames.
Build Build
----- -----
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment