##// END OF EJS Templates
global: bulk replace simple pycompat.iteritems(x) with x.items()...
global: bulk replace simple pycompat.iteritems(x) with x.items() pycompat.iteritems() just calls .items(). This commit applies a regular expression search and replace to convert simple instances of pycompat.iteritems() with .items(). There are still a handful of calls to pycompat.iteritems() remaining. But these all have more complicated expressions that I wasn't comfortable performing an automated replace on. In addition, some simple replacements were withheld because they broke pytype. These will be handled by their own changesets. Differential Revision: https://phab.mercurial-scm.org/D12318

File last commit:

r49730:6000f5b2 default
r49768:f254fc73 default
Show More
encoding.py
74 lines | 2.8 KiB | text/x-python | PythonLexer
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 # Copyright 2016-present Facebook, Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# * Neither the name Facebook nor the names of its contributors may be used to
# endorse or promote products derived from this software without specific
# prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# 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.
# no unicode literals
import sys
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 from . import compat
"""Module to deal with filename encoding on the local system, as returned by
Watchman."""
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656
if compat.PYTHON3:
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 default_local_errors = "surrogateescape"
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656
def get_local_encoding():
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 if sys.platform == "win32":
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 # Watchman always returns UTF-8 encoded strings on Windows.
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 return "utf-8"
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 # On the Python 3 versions we support, sys.getfilesystemencoding never
# returns None.
return sys.getfilesystemencoding()
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 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.
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 default_local_errors = "strict"
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656
def get_local_encoding():
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 if sys.platform == "win32":
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 # Watchman always returns UTF-8 encoded strings on Windows.
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 return "utf-8"
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 fsencoding = sys.getfilesystemencoding()
if fsencoding is None:
# This is very unlikely to happen, but if it does, just use UTF-8
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 fsencoding = "utf-8"
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 return fsencoding
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 def encode_local(s):
return s.encode(get_local_encoding(), default_local_errors)
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 def decode_local(bs):
return bs.decode(get_local_encoding(), default_local_errors)