Bump required Python version to 3.6

3rdIteration · May 2, 2020 · d8005c3 · d8005c3
1 parent 7e47c93
commit d8005c3
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 63 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,5 +4,4 @@ python:
   - "3.8"
   - "3.7"
   - "3.6"
-  - "3.5"
 script:   python3 run-all-tests.py --no-pause -vv
diff --git a/btcrecover.py b/btcrecover.py
@@ -27,19 +27,10 @@
 
 from __future__ import print_function
 
-import sys
-
-if sys.version_info <= (3, 5):
-	sys.stdout.write("\n\n******************************************************************************\n\n")
-	sys.stdout.write("Sorry, BTCRecover no longer supports Python2 as it is officially End-of-Life.\n\n")
-	sys.stdout.write("You will need either to upgrade to at least Python 3.5 or download the final Python2 release.\n\n")
-	sys.stdout.write("Note: Python2 versions of this tool are now unsupported and will not receive improvements or fixes\n\n")
-	sys.stdout.write("Python2 releases and documentation for installing and using this tool with Python3 can be found at from https://github.com/3rdIteration/btcrecover.\n\n")
-	sys.stdout.write("******************************************************************************\n\n")
-	sys.exit(1)
+import compatibility_check
 
 from btcrecover import btcrpass
-import multiprocessing
+import sys, multiprocessing
 
 if __name__ == "__main__":
 	print()

diff --git a/compatibility_check.py b/compatibility_check.py
@@ -0,0 +1,11 @@
+import sys
+if sys.version_info < (3, 6):
+	sys.stdout.write("\n\n************************************ Python Version Error ******************************************\n\n")
+	sys.stdout.write("Sorry, BTCRecover no longer supports Python2 as it is officially End-of-Life...\n\n")
+	sys.stdout.write("Some features of this tool also require Python 3.6 or above to work....\n\n")
+	sys.stdout.write("You will need either to upgrade to at least Python 3.6 or download the final Python2 release.\n\n")
+	sys.stdout.write("Note: Python2 versions of this tool are now unsupported and will not receive improvements or fixes\n\n")
+	sys.stdout.write("Python2 releases and documentation for installing and using this tool with Python3 can be found at from https://github.com/3rdIteration/btcrecover.\n\n")
+	sys.stdout.write("************************************ Python Version Error ******************************************\n\n")
+	sys.exit(1)
+
diff --git a/create-address-db.py b/create-address-db.py
@@ -27,19 +27,10 @@
 
 from __future__ import print_function
 
-
-import sys
-if sys.version_info <= (3, 5):
-	sys.stdout.write("\n\n******************************************************************************\n\n")
-	sys.stdout.write("Sorry, BTCRecover no longer supports Python2 as it is officially End-of-Life.\n\n")
-	sys.stdout.write("You will need either to upgrade to at least Python 3.5 or download the final Python2 release.\n\n")
-	sys.stdout.write("Note: Python2 versions of this tool are now unsupported and will not receive improvements or fixes\n\n")
-	sys.stdout.write("Python2 releases and documentation for installing and using this tool with Python3 can be found at from https://github.com/3rdIteration/btcrecover.\n\n")
-	sys.stdout.write("******************************************************************************\n\n")
-	sys.exit(1)
+import compatibility_check
 
 from btcrecover import addressset
-import argparse, atexit
+import sys,argparse, atexit
 from os import path
 
 __version__ =  "1.2.0-CryptoGuide"

diff --git a/docs/INSTALL.md b/docs/INSTALL.md
@@ -9,37 +9,39 @@ Locate your wallet type in the list below, and follow the instructions for only
 **Note** that for Armory wallets, you must have Armory 0.92.x or later installed on the computer where you run *btcrecover*.
 
  * Armory 0.91.x or earlier - unsupported, please upgrade Armory first
- * Armory 0.92.x on Windows -[Python 3.8](#python-38)(x86)
- * Armory 0.93+ on Windows - [Python 3.8](#python-38) **64-bit** (x86-64)
+ * Armory 0.92.x on Windows - 
+ * Armory 0.93+ on Windows -  
  * Armory 0.92+ on Linux - no additional requirements
  * Armory 0.92+ on OS X - some versions of Armory may not work correctly on OS X, if in doubt use version 0.95.1
  * Bitcoin Unlimited/Classic/XT/Core - optional: [PyCryptoDome](#pycryptodome)
- * MultiBit Classic - [Python 3.8](#python-38), recommended: [PyCryptoDome](#pycryptodome)
- * MultiBit HD - [Python 3.8](#python-38), optional: [PyCryptoDome](#pycryptodome)
- * Electrum (1.x or 2.x) - [Python 3.8](#python-38), recommended: [PyCryptoDome](#pycryptodome)
- * Electrum 2.8+ fully encrypted wallets - [Python 3.8](#python-38), [coincurve](Seedrecover_Quick_Start_Guide.md#installation), optional: [PyCryptoDome](#pycryptodome)
- * BIP-39 Bitcoin passphrases (e.g. TREZOR) - [Python 3.8](#python-38), [coincurve](Seedrecover_Quick_Start_Guide.md#installation)
- * BIP-39 Ethereum passphrases (e.g. TREZOR) - [Python 3.8](#python-38), [PyCryptoDome](#pycryptodome) [coincurve](Seedrecover_Quick_Start_Guide.md#installation)
- * Hive for OS X - [Python 3.8](#python-38), [Google protobuf](#google-protocol-buffers), optional: [PyCryptoDome](#pycryptodome)
- * mSIGNA (CoinVault) - [Python 3.8](#python-38), recommended: [PyCryptoDome](#pycryptodome)
- * Blockchain.info - [Python 3.8](#python-38), recommended: [PyCryptoDome](#pycryptodome)
- * Bitcoin Wallet for Android/BlackBerry backup - [Python 3.8](#python-38), recommended: [PyCryptoDome](#pycryptodome)
- * Bitcoin Wallet for Android/BlackBerry spending PIN - [Python 3.8](#python-38), [scrypt](#scrypt), [Google protobuf](#google-protocol-buffers), optional: [PyCryptoDome](#pycryptodome)
- * KnC Wallet for Android backup - [Python 3.8](#python-38), recommended: [PyCryptoDome](#pycryptodome)
- * Bither - [Python 3.8](#python-38), [coincurve](Seedrecover_Quick_Start_Guide.md#installation), optional: [PyCryptoDome](#pycryptodome)
- * Litecoin-Qt - [Python 3.8](#python-38),  optional: [PyCryptoDome](#pycryptodome)
- * Electrum-LTC - [Python 3.8](#python-38), recommended: [PyCryptoDome](#pycryptodome)
- * Litecoin Wallet for Android - [Python 3.8](#python-38), recommended: [PyCryptoDome](#pycryptodome)
- * Dogecoin Core - [Python 3.8](#python-38),  optional: [PyCryptoDome](#pycryptodome)
- * MultiDoge - [Python 3.8](#python-38), recommended: [PyCryptoDome](#pycryptodome)
- * Dogecoin Wallet for Android - [Python 3.8](#python-38), recommended: [PyCryptoDome](#pycryptodome)
+ * MultiBit Classic - recommended: [PyCryptoDome](#pycryptodome)
+ * MultiBit HD - optional: [PyCryptoDome](#pycryptodome)
+ * Electrum (1.x or 2.x) - recommended: [PyCryptoDome](#pycryptodome)
+ * Electrum 2.8+ fully encrypted wallets - [coincurve](Seedrecover_Quick_Start_Guide.md#installation), optional: [PyCryptoDome](#pycryptodome)
+ * BIP-39 Bitcoin passphrases (e.g. TREZOR) - [coincurve](Seedrecover_Quick_Start_Guide.md#installation)
+ * BIP-39 Ethereum passphrases (e.g. TREZOR) - [PyCryptoDome](#pycryptodome) [coincurve](Seedrecover_Quick_Start_Guide.md#installation)
+ * Hive for OS X - [Google protobuf](#google-protocol-buffers), optional: [PyCryptoDome](#pycryptodome)
+ * mSIGNA (CoinVault) - recommended: [PyCryptoDome](#pycryptodome)
+ * Blockchain.info - recommended: [PyCryptoDome](#pycryptodome)
+ * Bitcoin Wallet for Android/BlackBerry backup - recommended: [PyCryptoDome](#pycryptodome)
+ * Bitcoin Wallet for Android/BlackBerry spending PIN - [scrypt](#scrypt), [Google protobuf](#google-protocol-buffers), optional: [PyCryptoDome](#pycryptodome)
+ * KnC Wallet for Android backup - recommended: [PyCryptoDome](#pycryptodome)
+ * Bither - [coincurve](Seedrecover_Quick_Start_Guide.md#installation), optional: [PyCryptoDome](#pycryptodome)
+ * Litecoin-Qt -  optional: [PyCryptoDome](#pycryptodome)
+ * Electrum-LTC - recommended: [PyCryptoDome](#pycryptodome)
+ * Litecoin Wallet for Android - recommended: [PyCryptoDome](#pycryptodome)
+ * Dogecoin Core -  optional: [PyCryptoDome](#pycryptodome)
+ * MultiDoge - recommended: [PyCryptoDome](#pycryptodome)
+ * Dogecoin Wallet for Android - recommended: [PyCryptoDome](#pycryptodome)
 
 
 ----------
 
 
 ### Python 3.8 ###
 
+**Note:** Only Python 3.6 and later are supported...
+
 ##### Windows #####
 
 Visit the Python download page here: <https://www.python.org/downloads/windows/>, and click the link for the latest **Python 3.8** 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.

diff --git a/run-all-tests.py b/run-all-tests.py
@@ -26,15 +26,7 @@
 #                      Thank You!
 
 
-import sys
-if sys.version_info <= (3, 5):
-	sys.stdout.write("\n\n******************************************************************************\n\n")
-	sys.stdout.write("Sorry, BTCRecover no longer supports Python2 as it is officially End-of-Life.\n\n")
-	sys.stdout.write("You will need either to upgrade to at least Python 3.5 or download the final Python2 release.\n\n")
-	sys.stdout.write("Note: Python2 versions of this tool are now unsupported and will not receive improvements or fixes\n\n")
-	sys.stdout.write("Python2 releases and documentation for installing and using this tool with Python3 can be found at from https://github.com/3rdIteration/btcrecover.\n\n")
-	sys.stdout.write("******************************************************************************\n\n")
-	sys.exit(1)
+import compatibility_check
 
 # Use the green test runner if available
 try:

diff --git a/seedrecover.py b/seedrecover.py
@@ -27,18 +27,10 @@
 
 from __future__ import print_function
 
-import sys
-if sys.version_info <= (3, 5):
-	sys.stdout.write("\n\n******************************************************************************\n\n")
-	sys.stdout.write("Sorry, BTCRecover no longer supports Python2 as it is officially End-of-Life.\n\n")
-	sys.stdout.write("You will need either to upgrade to at least Python 3.5 or download the final Python2 release.\n\n")
-	sys.stdout.write("Note: Python2 versions of this tool are now unsupported and will not receive improvements or fixes\n\n")
-	sys.stdout.write("Python2 releases and documentation for installing and using this tool with Python3 can be found at from https://github.com/3rdIteration/btcrecover.\n\n")
-	sys.stdout.write("******************************************************************************\n\n")
-	sys.exit(1)
+import compatibility_check
 
 from btcrecover import btcrseed
-import multiprocessing
+import sys, multiprocessing
 
 if __name__ == "__main__":
     print()