equal
deleted
inserted
replaced
942 b = tempfromcontext(b"base", fca) |
942 b = tempfromcontext(b"base", fca) |
943 c = tempfromcontext(b"other", fco) |
943 c = tempfromcontext(b"other", fco) |
944 d = localpath |
944 d = localpath |
945 if localpath is not None: |
945 if localpath is not None: |
946 f, d = maketempfrompath(b"local", d) |
946 f, d = maketempfrompath(b"local", d) |
947 with open(localpath, b'rb') as src: |
947 data = util.readfile(localpath) |
948 f.write(src.read()) |
948 f.write(data) |
949 f.close() |
949 f.close() |
950 |
950 |
951 try: |
951 try: |
952 yield b, c, d |
952 yield b, c, d |
953 finally: |
953 finally: |