Merge pull request #37 from fulder/master

Improve if condition for required last semi colon

Author: peakwinter

nginx.py

@@ -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))

tests.py

@@ -213,6 +213,10 @@
 }
 """
 
+TESTBLOCK_CASE_13 = """
+server{
+}"""
+
 
 class TestPythonNginx(unittest.TestCase):
     def test_basic_load(self):
@@ -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()