--- a/hgext/fsmonitor/pywatchman/encoding.py Mon Nov 04 10:09:08 2019 +0100
+++ b/hgext/fsmonitor/pywatchman/encoding.py Sat Nov 02 12:42:23 2019 -0700
@@ -26,48 +26,50 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
# no unicode literals
-
-'''Module to deal with filename encoding on the local system, as returned by
-Watchman.'''
+from __future__ import absolute_import, division, print_function
import sys
-from . import (
- compat,
-)
+from . import compat
+
+
+"""Module to deal with filename encoding on the local system, as returned by
+Watchman."""
+
if compat.PYTHON3:
- default_local_errors = 'surrogateescape'
+ default_local_errors = "surrogateescape"
def get_local_encoding():
- if sys.platform == 'win32':
+ if sys.platform == "win32":
# Watchman always returns UTF-8 encoded strings on Windows.
- return 'utf-8'
+ return "utf-8"
# On the Python 3 versions we support, sys.getfilesystemencoding never
# returns None.
return sys.getfilesystemencoding()
+
+
else:
# Python 2 doesn't support surrogateescape, so use 'strict' by
# default. Users can register a custom surrogateescape error handler and use
# that if they so desire.
- default_local_errors = 'strict'
+ default_local_errors = "strict"
def get_local_encoding():
- if sys.platform == 'win32':
+ if sys.platform == "win32":
# Watchman always returns UTF-8 encoded strings on Windows.
- return 'utf-8'
+ return "utf-8"
fsencoding = sys.getfilesystemencoding()
if fsencoding is None:
# This is very unlikely to happen, but if it does, just use UTF-8
- fsencoding = 'utf-8'
+ fsencoding = "utf-8"
return fsencoding
+
def encode_local(s):
return s.encode(get_local_encoding(), default_local_errors)
+
def decode_local(bs):
return bs.decode(get_local_encoding(), default_local_errors)