@@ 21,16 21,23 @@ from __future__ import absolute_import
from mercurial import (
encoding,
- util,
)
+try:
+ from mercurial.utils import stringutil
+ _binarydata = stringutil.binary
+except (AttributeError, ImportError):
+ # hg<4.6
+ from mercurial import util
+ _binarydata = util.binary
+
def _binaryenc(enc):
enc = enc.lower().translate(None, '_-')
return enc.startswith(('utf16', 'utf32', 'u16', 'u32'))
def filterencoding(ui, fctx, data):
dataencs = ui.configlist('textful', 'encoding', [])
- if not any(_binaryenc(e) for e in dataencs) and util.binary(data):
+ if not any(_binaryenc(e) for e in dataencs) and _binarydata(data):
return data
for enc in dataencs: