Mercurial Repositories > eric / file comparison
comparison: Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py
Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py
- changeset 6109
- 041715a2f703
- parent 6108
- 59cf5a66b0b3
- child 6119
- 18fb5d765f3a
equal
deleted
inserted
replaced
| 6108:59cf5a66b0b3 | 6109:041715a2f703 |
|---|---|
| 26 except ImportError: | 26 except ImportError: |
| 27 pass | 27 pass |
| 28 | 28 |
| 29 VcsConflictMarkerRegExpList = ( | 29 VcsConflictMarkerRegExpList = ( |
| 30 re.compile( | 30 re.compile( |
| 31 r"""^<<<<<<< .*?\|\|\|\|\|\|\| .*?=======.*?>>>>>>> .*?$""", | |
| 32 re.MULTILINE | re.DOTALL | |
| 33 ), | |
| 34 re.compile( | |
| 31 r"""^<<<<<<< .*?=======.*?>>>>>>> .*?$""", | 35 r"""^<<<<<<< .*?=======.*?>>>>>>> .*?$""", |
| 32 re.MULTILINE | re.DOTALL | 36 re.MULTILINE | re.DOTALL |
| 33 ), | 37 ), |
| 34 re.compile( | |
| 35 r"""^<<<<<<< .*?||||||| .*?=======.*?>>>>>>> .*?$""", | |
| 36 re.MULTILINE | re.DOTALL | |
| 37 ) | |
| 38 ) | 38 ) |
| 39 | 39 |
| 40 def initService(): | 40 def initService(): |
| 41 """ | 41 """ |
| 42 Initialize the service and return the entry point. | 42 Initialize the service and return the entry point. |
