diff options
Diffstat (limited to 'subcmds/status.py')
| -rw-r--r-- | subcmds/status.py | 11 |
1 files changed, 8 insertions, 3 deletions
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: | |||
| 21 | import dummy_threading as _threading | 21 | import dummy_threading as _threading |
| 22 | 22 | ||
| 23 | import glob | 23 | import glob |
| 24 | try: | ||
| 25 | # For python2 | ||
| 26 | import StringIO as io | ||
| 27 | except ImportError: | ||
| 28 | # For python3 | ||
| 29 | import io | ||
| 24 | import itertools | 30 | import itertools |
| 25 | import os | 31 | import os |
| 26 | import sys | 32 | import sys |
| 27 | import StringIO | ||
| 28 | 33 | ||
| 29 | from color import Coloring | 34 | from color import Coloring |
| 30 | 35 | ||
| @@ -142,7 +147,7 @@ the following meanings: | |||
| 142 | for project in all_projects: | 147 | for project in all_projects: |
| 143 | sem.acquire() | 148 | sem.acquire() |
| 144 | 149 | ||
| 145 | class BufList(StringIO.StringIO): | 150 | class BufList(io.StringIO): |
| 146 | def dump(self, ostream): | 151 | def dump(self, ostream): |
| 147 | for entry in self.buflist: | 152 | for entry in self.buflist: |
| 148 | ostream.write(entry) | 153 | ostream.write(entry) |
| @@ -182,7 +187,7 @@ the following meanings: | |||
| 182 | try: | 187 | try: |
| 183 | os.chdir(self.manifest.topdir) | 188 | os.chdir(self.manifest.topdir) |
| 184 | 189 | ||
| 185 | outstring = StringIO.StringIO() | 190 | outstring = io.StringIO() |
| 186 | self._FindOrphans(glob.glob('.*') + \ | 191 | self._FindOrphans(glob.glob('.*') + \ |
| 187 | glob.glob('*'), \ | 192 | glob.glob('*'), \ |
| 188 | proj_dirs, proj_dirs_parents, outstring) | 193 | proj_dirs, proj_dirs_parents, outstring) |
