--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -2,6 +2,7 @@
import json
import logging
import re
+import difflib
from urllib import quote, unquote
from collections import defaultdict
@@ -16,7 +17,6 @@
from ming.orm import ThreadLocalORMSession, session
import allura.tasks
-from allura.lib import patience
from allura.lib import security
from allura.lib import helpers as h
from allura.lib import widgets as w
@@ -520,7 +520,7 @@
b = self._blob
la = list(a)
lb = list(b)
- diff = ''.join(patience.unified_diff(
+ diff = ''.join(difflib.unified_diff(
la, lb,
('a' + apath).encode('utf-8'),
('b' + b.path()).encode('utf-8')))