diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-18 21:24:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-18 21:24:37 +0000 |
| commit | e4e4866ae4a7e698fc556dfbd671924fc3ff0be7 (patch) | |
| tree | 2017dc1a64ca790bf2067ea422ef61cf8e3f27c7 /pym/portage/getbinpkg.py | |
| parent | b712814fe5dcccf0d8d5bced54ac563206f3c566 (diff) | |
| download | portage-e4e4866ae4a7e698fc556dfbd671924fc3ff0be7.tar.gz portage-e4e4866ae4a7e698fc556dfbd671924fc3ff0be7.tar.bz2 portage-e4e4866ae4a7e698fc556dfbd671924fc3ff0be7.zip | |
Use portage.os and _encodings['fs'] where appropriate.
svn path=/main/trunk/; revision=14093
Diffstat (limited to 'pym/portage/getbinpkg.py')
| -rw-r--r-- | pym/portage/getbinpkg.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py index ac8deae0b..dfe2fad59 100644 --- a/pym/portage/getbinpkg.py +++ b/pym/portage/getbinpkg.py @@ -7,9 +7,12 @@ from portage.output import colorize from portage.cache.mappings import slot_dict_class from portage.localization import _ import portage +from portage import os +from portage import _encodings +from portage import _unicode_encode + import HTMLParser import sys -import os import socket import time import tempfile @@ -486,7 +489,8 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= out = sys.stdout try: - metadatafile = open(metadatafilename, 'rb') + metadatafile = open(_unicode_encode(metadatafilename, + encoding=_encodings['fs'], errors='strict'), 'rb') mypickle = pickle.Unpickler(metadatafile) try: mypickle.find_global = None @@ -581,7 +585,8 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= sys.stderr.write("!!! "+str(e)+"\n") sys.stderr.flush() try: - metadatafile = open(metadatafilename, 'wb') + metadatafile = open(_unicode_encode(metadatafilename, + encoding=_encodings['fs'], errors='strict'), 'wb') pickle.dump(metadata, metadatafile, protocol=2) metadatafile.close() except SystemExit, e: @@ -673,11 +678,13 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache= try: if "modified" in metadata[baseurl] and metadata[baseurl]["modified"]: metadata[baseurl]["timestamp"] = int(time.time()) - metadatafile = open(metadatafilename, 'wb') + metadatafile = open(_unicode_encode(metadatafilename, + encoding=_encodings['fs'], errors='strict'), 'wb') pickle.dump(metadata, metadatafile, protocol=2) metadatafile.close() if makepickle: - metadatafile = open(makepickle, 'wb') + metadatafile = open(_unicode_encode(makepickle, + encoding=_encodings['fs'], errors='strict'), 'wb') pickle.dump(metadata[baseurl]["data"], metadatafile, protocol=2) metadatafile.close() except SystemExit, e: |