Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyCheckSyntax.py
src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyCheckSyntax.py
- branch
- eric7
- changeset 10690
- fab36645aa7d
- parent 10670
- bfa05f79d932
- child 11090
- f5f5f5803935
equal
deleted
inserted
replaced
| 10689:3ede487187f2 | 10690:fab36645aa7d |
|---|---|
| 273 try: | 273 try: |
| 274 # Check for VCS conflict markers | 274 # Check for VCS conflict markers |
| 275 for conflictMarkerRe in VcsConflictMarkerRegExpList: | 275 for conflictMarkerRe in VcsConflictMarkerRegExpList: |
| 276 conflict = conflictMarkerRe.search(codestring) | 276 conflict = conflictMarkerRe.search(codestring) |
| 277 if conflict is not None: | 277 if conflict is not None: |
| 278 start, i = conflict.span() | 278 start, _i = conflict.span() |
| 279 lineindex = 1 + codestring.count("\n", 0, start) | 279 lineindex = 1 + codestring.count("\n", 0, start) |
| 280 return [ | 280 return [ |
| 281 { | 281 { |
| 282 "error": ( | 282 "error": ( |
| 283 filename, | 283 filename, |
