From 0c959cb67a232abfaafcdabba91299a04e364df6 Mon Sep 17 00:00:00 2001
From: enkore <public@enkore.de>
Date: Sat, 17 Dec 2016 15:58:51 +0100
Subject: [PATCH] pytest 2 compat

---
 conftest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conftest.py b/conftest.py
index a1822767d..b23f30d1a 100644
--- a/conftest.py
+++ b/conftest.py
@@ -3,7 +3,8 @@ import os
 import pytest
 
 # needed to get pretty assertion failures in unit tests:
-pytest.register_assert_rewrite('borg.testsuite')
+if hasattr(pytest, 'register_assert_rewrite'):
+    pytest.register_assert_rewrite('borg.testsuite')
 
 from borg.logger import setup_logging