Skip to content

Improve if condition for required last semi colon #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 20, 2021
Merged

Improve if condition for required last semi colon #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30b136d
Improve condition for checking of last missing semi colon
fulder Aug 22, 2020
5dabc30
Add previously failing test for missing last line break
fulder Aug 22, 2020
4f57e06
Merge remote-tracking branch 'upstream/master'
fulder Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nginx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ def loads(data, conf=True):
index += m.end()
continue

if ";" not in data[index:] and index+1 != len(data):
if ";" not in data[index:] and "}" in data[index:]:
# If there is still something to parse, expect ';' otherwise
# the Key regexp can get stuck due to regexp catastrophic backtracking
raise ParseError("Config syntax, missing ';' at index: {}".format(index))
Expand Down
9 changes: 8 additions & 1 deletion tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@
}
"""

TESTBLOCK_CASE_13 = """
server{
}"""


class TestPythonNginx(unittest.TestCase):
def test_basic_load(self):
Expand Down Expand Up @@ -332,12 +336,15 @@ def test_missing_semi_colon(self):
with pytest.raises(nginx.ParseError) as e:
nginx.loads(TESTBLOCK_CASE_11)
self.assertEqual(str(e.value), "Config syntax, missing ';' at index: 189")

def test_brace_inside_block_param(self):
inp_data = nginx.loads(TESTBLOCK_CASE_12)
self.assertEqual(len(inp_data.server.filter("Location")), 1)
self.assertEqual(inp_data.server.filter("Location")[0].value, "~ \"^/(test|[0-9a-zA-Z]{6})$\"")

def test_server_without_last_linebreak(self):
self.assertTrue(nginx.loads(TESTBLOCK_CASE_13) is not None)


if __name__ == '__main__':
unittest.main()