diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:00:59 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:00:59 +0000 |
| commit | 548a5301c6d6390ba11808ee91247c9ab649574a (patch) | |
| tree | af91f6a4638dd8a6a2464f02a93b9055e5a3e2b4 /pym/_emerge | |
| parent | 87231f133db9f0e286199d5be67bd45292622520 (diff) | |
| download | portage-548a5301c6d6390ba11808ee91247c9ab649574a.tar.gz portage-548a5301c6d6390ba11808ee91247c9ab649574a.tar.bz2 portage-548a5301c6d6390ba11808ee91247c9ab649574a.zip | |
Fix StringIO imports so that 2to3 can handle them. Also, replace shlex +
StringIO usage with shlex.split() where appropriate. (trunk r12662)
svn path=/main/branches/2.1.6/; revision=12925
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 2b80a41d5..9737952b3 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -63,9 +63,9 @@ except ImportError: import pickle try: - import cStringIO as StringIO + from cStringIO import StringIO except ImportError: - import StringIO + from StringIO import StringIO class stdout_spinner(object): scroll_msgs = [ @@ -9752,8 +9752,8 @@ class JobStatusDisplay(object): failed_str = str(self.failed) load_avg_str = self._load_avg_str() - color_output = StringIO.StringIO() - plain_output = StringIO.StringIO() + color_output = StringIO() + plain_output = StringIO() style_file = portage.output.ConsoleStyleFile(color_output) style_file.write_listener = plain_output style_writer = portage.output.StyleWriter(file=style_file, maxcol=9999) @@ -12281,7 +12281,6 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): mytimeout=180 rsync_opts = [] - import shlex, StringIO if settings["PORTAGE_RSYNC_OPTS"] == "": portage.writemsg("PORTAGE_RSYNC_OPTS empty or unset, using hardcoded defaults\n") rsync_opts.extend([ @@ -12306,12 +12305,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): # defaults. portage.writemsg("Using PORTAGE_RSYNC_OPTS instead of hardcoded defaults\n", 1) - lexer = shlex.shlex(StringIO.StringIO( - settings.get("PORTAGE_RSYNC_OPTS","")), posix=True) - lexer.whitespace_split = True - rsync_opts.extend(lexer) - del lexer - + rsync_opts.extend( + shlex.split(settings.get("PORTAGE_RSYNC_OPTS",""))) for opt in ("--recursive", "--times"): if opt not in rsync_opts: portage.writemsg(yellow("WARNING:") + " adding required option " + \ @@ -12389,11 +12384,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): user_name="" updatecache_flg=True all_rsync_opts = set(rsync_opts) - lexer = shlex.shlex(StringIO.StringIO( - settings.get("PORTAGE_RSYNC_EXTRA_OPTS","")), posix=True) - lexer.whitespace_split = True - extra_rsync_opts = list(lexer) - del lexer + extra_rsync_opts = shlex.split( + settings.get("PORTAGE_RSYNC_EXTRA_OPTS","")) all_rsync_opts.update(extra_rsync_opts) family = socket.AF_INET if "-4" in all_rsync_opts or "--ipv4" in all_rsync_opts: |