Merge https://github.com/madzak/python-json-logger

Conflicts:
	src/jsonlogger.py

Author: zebuline

setup.py

@@ -8,15 +8,14 @@
 
 setup(
     name = "python-json-logger",
-    version = "0.0.2",
+    version = "0.0.5",
     url = "http://github.com/madzak/python-json-logger",
     license = "BSD",
     description = "A python library adding a json log formatter",
     author = "Zakaria Zajac",
     author_email = "zak@madzak.com",
     package_dir = {'': 'src'},
     packages = [''],
-#    use_2to3 = True, 
     test_suite = "tests.tests",
     install_requires = ['setuptools'],
     classifiers = [

src/jsonlogger.py

@@ -31,7 +31,7 @@ def merge_record_extra(record, target, reserved=RESERVED_ATTR_HASH):
     :param target: dict to update
     :param reserved: dict or list with reserved keys to skip
     """
-    for key, value in record.__dict__.iteritems():
+    for key, value in record.__dict__.items():
         #this allows to have numeric keys
         if (key not in reserved
             and not (hasattr(key,"startswith") and key.startswith('_'))
@@ -98,10 +98,11 @@ def format(self, record):
             log_record = {}
 
         for field in self._required_fields:
-            log_record[field] = record.__dict__[field]
+            log_record[field] = record.__dict__.get(field)
         log_record.update(extras)
         merge_record_extra(record, log_record, reserved=self._skip_fields)
 
-        return "%s%s" % (self.prefix, json.dumps(log_record,
-                            default=self.json_default,
-                            cls=self.json_encoder))
+        return "%s%s" % (self.prefix,
+                         json.dumps(log_record,
+                                    default=self.json_default,
+                                    cls=self.json_encoder))

tests/tests.py

@@ -72,8 +72,6 @@ def testFormatKeys(self):
 
     def testUnknownFormatKey(self):
         fr = jsonlogger.JsonFormatter('%(unknown_key)s %(message)s')
-        self.assertRaises(KeyError,
-                          fr.format, logging.makeLogRecord({"msg":"test"}))
 
         self.logHandler.setFormatter(fr)
         msg = "testing unknown logging format"