mirror of
https://github.com/StevenBlack/hosts.git
synced 2026-07-01 02:36:52 +00:00
Deletion of decode_line() as it is not required anymore in python 3
Also: * Deletion of any PY3 references
This commit is contained in:
@@ -17,9 +17,6 @@ README_TEMPLATE = os.path.join(BASEDIR_PATH, 'readme_template.md')
|
|||||||
README_FILENAME = 'readme.md'
|
README_FILENAME = 'readme.md'
|
||||||
README_DATA_FILENAME = "readmeData.json"
|
README_DATA_FILENAME = "readmeData.json"
|
||||||
|
|
||||||
# Detecting Python 3 for version-dependent implementations
|
|
||||||
PY3 = sys.version_info >= (3, 0)
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
s = Template('${description} | [Readme](https://github.com/StevenBlack/'
|
s = Template('${description} | [Readme](https://github.com/StevenBlack/'
|
||||||
@@ -31,10 +28,7 @@ def main():
|
|||||||
with open(README_DATA_FILENAME, 'r') as f:
|
with open(README_DATA_FILENAME, 'r') as f:
|
||||||
data = json.load(f)
|
data = json.load(f)
|
||||||
|
|
||||||
if PY3:
|
keys = list(data.keys())
|
||||||
keys = list(data.keys())
|
|
||||||
else:
|
|
||||||
keys = data.keys()
|
|
||||||
|
|
||||||
# Sort by the number of en-dashes in the key
|
# Sort by the number of en-dashes in the key
|
||||||
# and then by the key string itself.
|
# and then by the key string itself.
|
||||||
@@ -83,62 +77,15 @@ def main():
|
|||||||
for line in open(README_TEMPLATE):
|
for line in open(README_TEMPLATE):
|
||||||
line = line.replace('@GEN_DATE@', time.strftime("%B %d %Y",
|
line = line.replace('@GEN_DATE@', time.strftime("%B %d %Y",
|
||||||
time.gmtime()))
|
time.gmtime()))
|
||||||
line = line.replace('@EXTENSIONS@',
|
line = line.replace('@EXTENSIONS@',extensions_str)
|
||||||
decode_line(extensions_str))
|
line = line.replace('@EXTENSIONS_HEADER@', extensions_header))
|
||||||
line = line.replace('@EXTENSIONS_HEADER@',
|
|
||||||
decode_line(extensions_header))
|
|
||||||
line = line.replace('@NUM_ENTRIES@',
|
line = line.replace('@NUM_ENTRIES@',
|
||||||
"{:,}".format(data[key]["entries"]))
|
"{:,}".format(data[key]["entries"]))
|
||||||
line = line.replace('@SUBFOLDER@',
|
line = line.replace('@SUBFOLDER@', os.path.join(
|
||||||
decode_line(os.path.join(
|
data[key]["location"], ''))
|
||||||
data[key]["location"], '')))
|
line = line.replace('@TOCROWS@', toc_rows)
|
||||||
line = line.replace('@TOCROWS@',
|
line = line.replace('@SOURCEROWS@', source_rows)
|
||||||
decode_line(toc_rows))
|
out.write(line)
|
||||||
line = line.replace('@SOURCEROWS@',
|
|
||||||
decode_line(source_rows))
|
|
||||||
out.write(decode_line(line))
|
|
||||||
|
|
||||||
|
|
||||||
def decode_line(line):
|
|
||||||
"""
|
|
||||||
Python 2 compatible method for decoding unicode lines.
|
|
||||||
|
|
||||||
Parameters
|
|
||||||
----------
|
|
||||||
line : str
|
|
||||||
The unicode string to decode.
|
|
||||||
|
|
||||||
Returns
|
|
||||||
-------
|
|
||||||
decoded_str : str
|
|
||||||
Decoded unicode string.
|
|
||||||
"""
|
|
||||||
|
|
||||||
# Python 3.x has no unicode issues.
|
|
||||||
if PY3:
|
|
||||||
return line
|
|
||||||
|
|
||||||
# The biggest Python 2.x compatibility issue is the decoding of the
|
|
||||||
# en-dash. It either takes the form of u"\u2013" or "\xe2\x80\x93."
|
|
||||||
#
|
|
||||||
# This attempts to convert "\xe2\x80\x93" to u"\u2013" if necessary.
|
|
||||||
# If the character is already in the form of u"\u2013," this will
|
|
||||||
# raise an UnicodeEncodeError.
|
|
||||||
#
|
|
||||||
# In general, this line of code will allow us to convert unicode,
|
|
||||||
# UTF-8 encoded characters into pure unicode.
|
|
||||||
try:
|
|
||||||
line = line.decode("UTF-8")
|
|
||||||
except UnicodeEncodeError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Replace u"\u2013" with the en-dash, so we now can decode.
|
|
||||||
#
|
|
||||||
# We can add additional "replace" lines in case there are other unicode
|
|
||||||
# literals that Python 2.x cannot handle.
|
|
||||||
line = line.replace(u"\u2013", "-")
|
|
||||||
return str(line.decode("UTF-8"))
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
|
|||||||
Reference in New Issue
Block a user