Fix support for asctime attribute

This does not work in python2.6 as it did not use usesTime to detect the
presence of asctime in fmt.

Author: EvaSDK

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"

fluent/handler.py

@@ -2,6 +2,7 @@
 
 import logging
 import socket
+import sys
 
 try:
     import simplejson as json
@@ -38,6 +39,10 @@ def __init__(self, fmt=None, datefmt=None):
         self.hostname = socket.gethostname()
 
     def format(self, record):
+        # Only needed for python2.6
+        if sys.version_info[0:2] <= (2, 6) and self.usesTime():
+            record.asctime = self.formatTime(record, self.datefmt)
+
         # Compute attributes handled by parent class.
         super(FluentRecordFormatter, self).format(record)
         # Add ours
@@ -49,6 +54,10 @@ def format(self, record):
         self._structuring(data, record.msg)
         return data
 
+    def usesTime(self):
+        return any([value.find('%(asctime)') >= 0
+                    for value in self._fmt_dict.values()])
+
     def _structuring(self, data, msg):
         """ Melds `msg` into `data`.
 

tests/test_handler.py

@@ -54,6 +54,7 @@ def test_custom_fmt(self):
             fluent.handler.FluentRecordFormatter(fmt={
                 'name': '%(name)s',
                 'lineno': '%(lineno)d',
+                'emitted_at': '%(asctime)s',
             })
         )
         log.addHandler(handler)
@@ -64,6 +65,7 @@ def test_custom_fmt(self):
         self.assertTrue('name' in data[0][2])
         self.assertEqual('fluent.test', data[0][2]['name'])
         self.assertTrue('lineno' in data[0][2])
+        self.assertTrue('emitted_at' in data[0][2])
 
     def test_unstructured_message(self):
         handler = fluent.handler.FluentHandler('app.follow', port=self._port)