Merge pull request #49 from nberezin/bugfix-py2.7-compatibility

Bugfix for python2.7 compatibility issue #45

Author: Yury Krasouski

pytest_reportportal/rp_logging.py

@@ -2,6 +2,7 @@
 import logging
 from contextlib import contextmanager
 from functools import wraps
+from six import PY2
 
 from .service import PyTestService
 
@@ -22,7 +23,13 @@ def _log(self, level, msg, args,
             # exception on some versions of IronPython. We trap it here so that
             # IronPython can use logging.
             try:
-                fn, lno, func, sinfo = self.findCaller(stack_info)
+                if PY2:
+                    # In python2.7 findCaller() don't accept any parameters
+                    # and returns 3 elements
+                    fn, lno, func = self.findCaller()
+                else:
+                    fn, lno, func, sinfo = self.findCaller(stack_info)
+
             except ValueError:  # pragma: no cover
                 fn, lno, func = '(unknown file)', 0, '(unknown function)'
         else:
@@ -31,9 +38,14 @@ def _log(self, level, msg, args,
         if exc_info and not isinstance(exc_info, tuple):
             exc_info = sys.exc_info()
 
-        record = self.makeRecord(
-            self.name, level, fn, lno, msg, args, exc_info, func, extra, sinfo
-        )
+        if PY2:
+            # In python2.7 makeRecord() accepts everything but sinfo
+            record = self.makeRecord(self.name, level, fn, lno, msg, args,
+                                     exc_info, func, extra)
+        else:
+            record = self.makeRecord(self.name, level, fn, lno, msg, args,
+                                     exc_info, func, extra, sinfo)
+
         record.attachment = attachment
         self.handle(record)