From 217ea7d2747e3098009afe0b389fc4b45f55ea5a Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Fri, 1 Mar 2013 19:14:38 +0530 Subject: Some fixes for supporting python3 * Fix imports. * Use python3 syntax. * Wrap map() calls with list(). * Use list() only wherever needed. (Thanks Conley!) * Fix dictionary iteration methods (s/iteritems/items/). * Make use of sorted() in appropriate places * Use iterators directly in the loop. * Don't use .keys() wherever it isn't needed. * Use sys.maxsize instead of sys.maxint TODO: * Make repo work fully with python3. :) Some of this was done by the '2to3' tool [1], by applying the needed fixes in a way that doesn't break compatibility with python2. Links: [1]: http://docs.python.org/2/library/2to3.html Change-Id: Ibdf3bf9a530d716db905733cb9bfef83a48820f7 Signed-off-by: Chirayu Desai --- subcmds/status.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'subcmds/status.py') diff --git a/subcmds/status.py b/subcmds/status.py index cce00c81..9810337f 100644 --- a/subcmds/status.py +++ b/subcmds/status.py @@ -21,10 +21,15 @@ except ImportError: import dummy_threading as _threading import glob +try: + # For python2 + import StringIO as io +except ImportError: + # For python3 + import io import itertools import os import sys -import StringIO from color import Coloring @@ -142,7 +147,7 @@ the following meanings: for project in all_projects: sem.acquire() - class BufList(StringIO.StringIO): + class BufList(io.StringIO): def dump(self, ostream): for entry in self.buflist: ostream.write(entry) @@ -182,7 +187,7 @@ the following meanings: try: os.chdir(self.manifest.topdir) - outstring = StringIO.StringIO() + outstring = io.StringIO() self._FindOrphans(glob.glob('.*') + \ glob.glob('*'), \ proj_dirs, proj_dirs_parents, outstring) -- cgit v1.2.3-54-g00ecf