Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py
eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py
- changeset 7635
- 0cdead130a81
- parent 7628
- f904d0eef264
- child 7637
- c878e8255972
equal
deleted
inserted
replaced
| 7634:8c3d033e5044 | 7635:0cdead130a81 |
|---|---|
| 238 if sys.version_info[0] == 2: | 238 if sys.version_info[0] == 2: |
| 239 file_enc = filename.encode(sys.getfilesystemencoding()) | 239 file_enc = filename.encode(sys.getfilesystemencoding()) |
| 240 else: | 240 else: |
| 241 file_enc = filename | 241 file_enc = filename |
| 242 | 242 |
| 243 # It also encode the code back to avoid 'Encoding declaration in | |
| 244 # unicode string' exception on Python2 | |
| 245 codestring = normalizeCode(codestring) | 243 codestring = normalizeCode(codestring) |
| 246 | 244 |
| 247 # Check for VCS conflict markers | 245 # Check for VCS conflict markers |
| 248 for conflictMarkerRe in VcsConflictMarkerRegExpList: | 246 for conflictMarkerRe in VcsConflictMarkerRegExpList: |
| 249 conflict = conflictMarkerRe.search(codestring) | 247 conflict = conflictMarkerRe.search(codestring) |
