equal
deleted
inserted
replaced
1137 eol = {'strict': None, 'crlf': '\r\n', 'lf': '\n'}[eolmode.lower()] |
1137 eol = {'strict': None, 'crlf': '\r\n', 'lf': '\n'}[eolmode.lower()] |
1138 except KeyError: |
1138 except KeyError: |
1139 raise util.Abort(_('Unsupported line endings type: %s') % eolmode) |
1139 raise util.Abort(_('Unsupported line endings type: %s') % eolmode) |
1140 |
1140 |
1141 try: |
1141 try: |
1142 fp = file(patchobj, 'rb') |
1142 fp = open(patchobj, 'rb') |
1143 except TypeError: |
1143 except TypeError: |
1144 fp = patchobj |
1144 fp = patchobj |
1145 if cwd: |
1145 if cwd: |
1146 curdir = os.getcwd() |
1146 curdir = os.getcwd() |
1147 os.chdir(cwd) |
1147 os.chdir(cwd) |