starred/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 03:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename NginxParser to RawNginxParser

Browse Source
This commit is contained in:
yan
2015-04-17 22:18:56 -07:00
parent b245394355
commit eaef4065e3
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/client/plugins/nginx/nginxparser.py
+4 -4
View File
@@ -6,7 +6,7 @@ from pyparsing import (
Optional, OneOrMore, ZeroOrMore, pythonStyleComment) Optional, OneOrMore, ZeroOrMore, pythonStyleComment)
class NginxParser(object): class RawNginxParser(object):
""" """
A class that parses nginx configuration with pyparsing A class that parses nginx configuration with pyparsing
""" """
@@ -50,7 +50,7 @@ class NginxParser(object):
return self.parse().asList() return self.parse().asList()
class NginxDumper(object): class RawNginxDumper(object):
""" """
A class that dumps nginx configuration from the provided tree. A class that dumps nginx configuration from the provided tree.
""" """
@@ -93,7 +93,7 @@ class NginxDumper(object):
# (like pyyaml, picker or json) # (like pyyaml, picker or json)
def loads(source): def loads(source):
return NginxParser(source).as_list() return RawNginxParser(source).as_list()
def load(_file): def load(_file):
@@ -101,7 +101,7 @@ def load(_file):
def dumps(blocks, indentation=4): def dumps(blocks, indentation=4):
return NginxDumper(blocks, indentation).as_string() return RawNginxDumper(blocks, indentation).as_string()
def dump(blocks, _file, indentation=4): def dump(blocks, _file, indentation=4):
letsencrypt/client/plugins/nginx/tests/nginxparser_test.py
+8 -8
View File
@@ -1,7 +1,7 @@
import operator import operator
import unittest import unittest
from letsencrypt.client.plugins.nginx.nginxparser import (NginxParser, from letsencrypt.client.plugins.nginx.nginxparser import (RawNginxParser,
load, dumps, dump) load, dumps, dump)
from letsencrypt.client.plugins.nginx.tests import util from letsencrypt.client.plugins.nginx.tests import util
@@ -9,25 +9,25 @@ from letsencrypt.client.plugins.nginx.tests import util
first = operator.itemgetter(0) first = operator.itemgetter(0)
class TestNginxParser(unittest.TestCase): class TestRawNginxParser(unittest.TestCase):
def test_assignments(self): def test_assignments(self):
parsed = NginxParser.assignment.parseString('root /test;').asList() parsed = RawNginxParser.assignment.parseString('root /test;').asList()
self.assertEqual(parsed, ['root', '/test']) self.assertEqual(parsed, ['root', '/test'])
parsed = NginxParser.assignment.parseString('root /test;' parsed = RawNginxParser.assignment.parseString('root /test;'
'foo bar;').asList() 'foo bar;').asList()
self.assertEqual(parsed, ['root', '/test'], ['foo', 'bar']) self.assertEqual(parsed, ['root', '/test'], ['foo', 'bar'])
def test_blocks(self): def test_blocks(self):
parsed = NginxParser.block.parseString('foo {}').asList() parsed = RawNginxParser.block.parseString('foo {}').asList()
self.assertEqual(parsed, [[['foo'], []]]) self.assertEqual(parsed, [[['foo'], []]])
parsed = NginxParser.block.parseString('location /foo{}').asList() parsed = RawNginxParser.block.parseString('location /foo{}').asList()
self.assertEqual(parsed, [[['location', '/foo'], []]]) self.assertEqual(parsed, [[['location', '/foo'], []]])
parsed = NginxParser.block.parseString('foo { bar foo; }').asList() parsed = RawNginxParser.block.parseString('foo { bar foo; }').asList()
self.assertEqual(parsed, [[['foo'], [['bar', 'foo']]]]) self.assertEqual(parsed, [[['foo'], [['bar', 'foo']]]])
def test_nested_blocks(self): def test_nested_blocks(self):
parsed = NginxParser.block.parseString('foo { bar {} }').asList() parsed = RawNginxParser.block.parseString('foo { bar {} }').asList()
block, content = first(parsed) block, content = first(parsed)
self.assertEqual(first(content), [['bar'], []]) self.assertEqual(first(content), [['bar'], []])