Mercurial Repositories > eric / file comparison
comparison: Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py
Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py
- changeset 3656
- 441956d8fce5
- parent 3635
- fc024806236d
- child 4021
- 195a471c327b
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 106 # Check for VCS conflict markers | 106 # Check for VCS conflict markers |
| 107 lineindex = 1 | 107 lineindex = 1 |
| 108 for line in codestring.splitlines(): | 108 for line in codestring.splitlines(): |
| 109 if any(line.startswith(c * 7) for c in "<>=|"): | 109 if any(line.startswith(c * 7) for c in "<>=|"): |
| 110 return [{'error': | 110 return [{'error': |
| 111 (file_enc, lineindex, 0, "", "VCS conflict marker found") | 111 (file_enc, lineindex, 0, "", |
| 112 }] | 112 "VCS conflict marker found") |
| 113 }] | |
| 113 lineindex += 1 | 114 lineindex += 1 |
| 114 | 115 |
| 115 if filename.endswith('.ptl'): | 116 if filename.endswith('.ptl'): |
| 116 try: | 117 try: |
| 117 import quixote.ptl_compile | 118 import quixote.ptl_compile |
