Merge pull request #27 from ferraith/bugfix/import-regex

ferraith · Jun 15, 2018 · 492761d · 492761d
2 parents a6a70f3 + e03f452
commit 492761d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,14 @@ adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.2.1] - 2018-06-15
+### Fixed
+- Faulty detection of import statements
+
 ## [0.2.0] - 2018-06-02
 ### Changed
 - Use package source directory as default output directory.
 
-[Unreleased]: https://github.com/ferraith/setuptools-antlr/compare/0.2.0...HEAD
+[Unreleased]: https://github.com/ferraith/setuptools-antlr/compare/0.2.1...HEAD
+[0.2.1]: https://github.com/ferraith/setuptools-antlr/compare/0.2.0...0.2.1
 [0.2.0]: https://github.com/ferraith/setuptools-antlr/compare/0.1.2...0.2.0
diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
 
     setuptools.setup(
         name='setuptools-antlr',
-        version='0.2.0',
+        version='0.2.1',
         packages=setuptools.find_packages(),
         package_data={'setuptools_antlr': ['lib/antlr-4.7.1-complete.jar', 'lib/LICENSE.txt']},
         entry_points={

diff --git a/setuptools_antlr/command.py b/setuptools_antlr/command.py
@@ -41,7 +41,7 @@ def read_imports(self) -> typing.List[str]:
 
         :return: a list of imported grammars
         """
-        import_stmt_regex = re.compile('import(.*);')
+        import_stmt_regex = re.compile('^\s*import\s*(.*)\s*;', re.MULTILINE)
 
         try:
             with self.path.open() as f: