update INSTALL & fix calcsize for earlier Pythons - Commit c1f4c70e - STRLCPY/btcrecover

update INSTALL & fix calcsize for earlier Pythons
```
closes #161
```
Christopher Gurnee committed 6 years ago

c1f4c70e

1 parent 82a6a8a4

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

Total 2 files Show one by one

■ ■ ■ ■ ■ ■

btcrecover/btcrpass.py

		skipped 48 lines
49	49		return "btcrecover {} on Python {} {}-bit, {}-bit unicodes, {}-bit ints".format(
50	50		__version__,
51	51		".".join(str(i) for i in sys.version_info[:3]),
52		-	calcsize("P") * 8,
	52	+	calcsize(b"P") * 8,
53	53		sys.maxunicode.bit_length(),
54	54		sys.maxint.bit_length() + 1
55	55		)
		skipped 254 lines
310	310		armory_path = progfiles_path + r"\Armory"
311	311		sys.path.extend((armory_path, armory_path + r"\library.zip"))
312	312		# 64-bit Armory might install into the 32-bit directory; if this is 64-bit Python look in both
313		-	if struct.calcsize('P') * 8 == 64: # calcsize('P') is a pointer's size in bytes
	313	+	if struct.calcsize(b"P") * 8 == 64: # calcsize('P') is a pointer's size in bytes
314	314		assert not progfiles_path.endswith("(x86)"), "ProgramFiles doesn't end with '(x86)' on x64 Python"
315	315		progfiles_path += " (x86)"
316	316		armory_path = progfiles_path + r"\Armory"
		skipped 5306 lines

■ ■ ■ ■ ■ ■

docs/INSTALL.md

		skipped 47 lines
48	48
49	49		##### Windows #####
50	50
51		-	Visit the Python download page here: <https://www.python.org/downloads/windows/>, and click the link for the latest Python 2 release. Download and run either the `Windows x86 MSI installer` for the 32-bit version of Python, or the `Windows x86-64 MSI installer` for the 64-bit one (for Armory wallets, be sure to choose the correct one as noted above). Modern PCs should use the 64-bit version, however if you're unsure which one is compatible with your PC, choose the 32-bit one.
	51	+	Visit the Python download page here: <https://www.python.org/downloads/windows/>, and click the link for the latest Python 2.7 release near the top of the page under the heading Python Releases for Windows. Download and run either the `Windows x86 MSI installer` for the 32-bit version of Python, or the `Windows x86-64 MSI installer` for the 64-bit one (for Armory wallets, be sure to choose the correct one as noted above). Modern PCs should use the 64-bit version, however if you're unsure which one is compatible with your PC, choose the 32-bit one.
52	52
53	53		##### Linux #####
54	54
		skipped 152 lines

Please wait...

Page is in error, reload to recover