fix finalizers after pytest update and remove py33 form supporters pythons (fixes #181 via #183)

ProSerg · sseliverstov · commit ae23da945fb1 · 2017-12-05T16:54:18.000+03:00
diff --git a/allure-behave/tox.ini b/allure-behave/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{27,33,34,35}
+    py{27,34,35}
     static_check
 
 [testenv]
@@ -69,4 +69,4 @@ commands = flake8 src/
 
 
 [flake8]
-max-line-length = 120
+max-line-length = 120
diff --git a/allure-pytest/src/listener.py b/allure-pytest/src/listener.py
@@ -128,10 +128,10 @@ def pytest_fixture_setup(self, fixturedef, request):
                                                stop=now(),
                                                status=get_outcome_status(outcome),
                                                statusDetails=get_outcome_status_details(outcome))
-
-        for index, finalizer in enumerate(fixturedef._finalizer or ()):
+        finalizers = fixturedef._finalizer if hasattr(fixturedef, 'finalizer') else fixturedef._finalizers
+        for index, finalizer in enumerate(finalizers or ()):
             name = '{fixture}::{finalizer}'.format(fixture=fixturedef.argname, finalizer=finalizer.__name__)
-            fixturedef._finalizer[index] = allure_commons.fixture(finalizer, parent_uuid=container_uuid, name=name)
+            finalizers[index] = allure_commons.fixture(finalizer, parent_uuid=container_uuid, name=name)
 
     @pytest.hookimpl(hookwrapper=True)
     def pytest_fixture_post_finalizer(self, fixturedef):
diff --git a/allure-pytest/tox.ini b/allure-pytest/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{27,33,34,35}
+    py{27,34,35}
     xdist
     static_check
 
@@ -64,4 +64,4 @@ commands = flake8 src/
 
 
 [flake8]
-max-line-length = 120
+max-line-length = 120
diff --git a/allure-python-commons-test/tox.ini b/allure-python-commons-test/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,33,34,35}
+envlist = py{27,34,35}
 
 
 [testenv]
diff --git a/allure-python-commons/tox.ini b/allure-python-commons/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist=
-    py{27,33,34,35}
+    py{27,34,35}
     static_check
 
 
@@ -23,4 +23,4 @@ commands = flake8 src/
 
 
 [flake8]
-max-line-length = 120
+max-line-length = 120
