Show More
@@ -53,7 +53,7 b' class p4_source(converter_source):' | |||
|
53 | 53 | def _parse_view(self, path): |
|
54 | 54 | "Read changes affecting the path" |
|
55 | 55 | cmd = 'p4 -G changes -s submitted "%s"' % path |
|
56 | stdout = util.popen(cmd) | |
|
56 | stdout = util.popen(cmd, mode='rb') | |
|
57 | 57 | for d in loaditer(stdout): |
|
58 | 58 | c = d.get("change", None) |
|
59 | 59 | if c: |
@@ -72,7 +72,7 b' class p4_source(converter_source):' | |||
|
72 | 72 | views = {"//": ""} |
|
73 | 73 | else: |
|
74 | 74 | cmd = 'p4 -G client -o "%s"' % path |
|
75 | clientspec = marshal.load(util.popen(cmd)) | |
|
75 | clientspec = marshal.load(util.popen(cmd, mode='rb')) | |
|
76 | 76 | |
|
77 | 77 | views = {} |
|
78 | 78 | for client in clientspec: |
@@ -105,7 +105,7 b' class p4_source(converter_source):' | |||
|
105 | 105 | lastid = None |
|
106 | 106 | for change in self.p4changes: |
|
107 | 107 | cmd = "p4 -G describe %s" % change |
|
108 | stdout = util.popen(cmd) | |
|
108 | stdout = util.popen(cmd, mode='rb') | |
|
109 | 109 | d = marshal.load(stdout) |
|
110 | 110 | |
|
111 | 111 | desc = self.recode(d["desc"]) |
@@ -147,7 +147,7 b' class p4_source(converter_source):' | |||
|
147 | 147 | |
|
148 | 148 | def getfile(self, name, rev): |
|
149 | 149 | cmd = 'p4 -G print "%s#%s"' % (self.depotname[name], rev) |
|
150 | stdout = util.popen(cmd) | |
|
150 | stdout = util.popen(cmd, mode='rb') | |
|
151 | 151 | |
|
152 | 152 | mode = None |
|
153 | 153 | contents = "" |
General Comments 0
You need to be logged in to leave comments.
Login now