0.2

Author: peakwinter

nginx.py

@@ -167,11 +167,11 @@ def as_list(self):
         return [self.name, self.value, ret]
 
     def as_dict(self):
-        return {'{} {}'.format(self.name, self.value): [x.as_dict() for x in self.blocks]}
+        return {'{0} {1}'.format(self.name, self.value): [x.as_dict() for x in self.blocks]}
 
     def as_block(self):
         ret = []
-        ret.append('{} {} {{\n'.format(self.name, self.value))
+        ret.append('{0} {1} {{\n'.format(self.name, self.value))
         for x in self.blocks:
             if isinstance(x, (Key, Comment)):
                 ret.append(INDENT + x.as_block())
@@ -198,7 +198,7 @@ def as_dict(self):
         return {'#': self.comment}
 
     def as_block(self):
-        return '# {}\n'.format(self.comment)
+        return '# {0}\n'.format(self.comment)
 
 
 class Location(Container):
@@ -243,7 +243,7 @@ def as_dict(self):
         return {self.name: self.value}
 
     def as_block(self):
-        return '{} {};\n'.format(self.name, self.value)
+        return '{0} {1};\n'.format(self.name, self.value)
 
 
 def loads(data, conf=True):
@@ -267,8 +267,9 @@ def loads(data, conf=True):
             lopen.insert(0, u)
         if re.match('.*;', line):
             kname, kval = re.match('.*(?:^|^\s*|{\s*)(\S+)\s(.+);', line).group(1, 2)
-            k = Key(kname, kval)
-            lopen[0].add(k)
+            if "#" not in kname:
+                k = Key(kname, kval)
+                lopen[0].add(k)
         if re.match('.*}', line):
             closenum = len(re.findall('}', line))
             while closenum > 0:

setup.py

@@ -4,19 +4,19 @@
 
 setup(
     name='python-nginx',
-    version='0.1.4',
+    version='0.2',
     description='Create and modify nginx serverblock configs in Python',
     author='Jacob Cook',
     author_email='jacob@peakwinter.net',
     url='https://github.com/peakwinter/python-nginx',
     py_modules=['nginx'],
     keywords = ['nginx', 'web servers', 'serverblock', 'server block'],
-    download_url = 'https://github.com/peakwinter/python-nginx/archive/0.1.3.tar.gz',
+    download_url = 'https://github.com/peakwinter/python-nginx/archive/0.2.tar.gz',
     license = 'GPLv3',
     classifiers = [
-    	"Development Status :: 3 - Alpha",
-    	"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
-    	"Operating System :: Unix",
-    	"Topic :: Internet :: WWW/HTTP :: HTTP Servers",
+        "Development Status :: 5 - Production/Stable",
+        "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+        "Operating System :: Unix",
+        "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
     ]
 )