fix: locked version to v3.x due to dns get_txt bug

Author: niftylettuce

.travis.yml

@@ -1,13 +1,10 @@
 language: python
-python: 2.7
+python: 3.5
 before_install:
   - nvm install v8.12.0
 install:
-  - sudo rm -rf /usr/lib/python2.7/dist-packages/ipaddress*
   - npm install -g yarn
-  - pip install pyspf==2.0.11
-  - pip install pydns==2.3.4
-  - pip install ipaddr
+  - pip3 install pyspf
   - yarn
 script:
   npm run test-coverage

README.md

@@ -22,42 +22,16 @@
 
 ## Requirements
 
-1. Ensure that you have a Python version of >=2.6 installed per [pyspf][] requirements:
+1. Ensure that you have a Python version of >= 3.5 installed per [pyspf][] requirements (note that Python v3 is required because of a bug with DNS recursive CNAME lookups on v2.7):
 
    ```sh
-   python --version
+   python3 --version
    ```
 
-2. Install the package "pyspf" using `pip` globally (**NOTE**: Versions > 2.0.11 currently have a bug that I emailed Scott Kitterman with regards to, specifically an exception is thrown of "Global name strict is not defined" due to a bug in the newer codebase that is not yet patched):
+2. Install the packages [pyspf][]:
 
    ```sh
-   pip install pyspf==2.0.11
-   ```
-
-3. Install the DNS package based off your version of Python:
-
-   > If you are using Python version >= 3:
-
-   ```sh
-   pip install py3dns
-   ```
-
-   > Otherwise install the older version (note `2.3.4` is the only version that seems to work OK on Mac):
-
-   ```sh
-   pip install pydns==2.3.4
-   ```
-
-4. Lastly if you are using Python version < 3.3 you will need to install "ipaddr" package:
-
-   ```sh
-   pip install ipaddr
-   ```
-
-5. If you run `pip list` and it shows `ipaddress` is installed, you will need to manually remove using the following command until this issue [sdgathman/pyspf#7](https://github.com/sdgathman/pyspf/issues/7) is resolved:
-
-   ```sh
-   sudo rm -rf /usr/lib/python2.7/dist-packages/ipaddress*
+   pip3 install pyspf
    ```
 
 

index.js

@@ -5,39 +5,27 @@ const semver = require('semver');
 const filePath = path.join(__dirname, 'spfcheck2.py');
 
 // ensure python installed
-if (!which('python')) throw new Error(`Python v2.6+ is required`);
+if (!which('python3')) throw new Error(`Python v3.5+ is required`);
 
-const silent = { silent: true };
+const silent = process.env.NODE_ENV !== 'test';
 
-// ensure python v2.6+
-let version = exec('python --version', silent);
+// ensure python v3.5+
+let version = exec('python3 --version', { silent });
 version = semver.coerce(
   (version.stdout || version.stderr).split(' ')[1].trim()
 );
 
-if (!semver.satisfies(version, '>= 2.6'))
+if (!semver.satisfies(version, '>= 3.5'))
   throw new Error(
-    `Python v2.6+ is required, you currently have v${version} installed`
+    `Python v3.5+ is required, you currently have v${version} installed`
   );
 
 module.exports = function(ip, address, host) {
   return new Promise((resolve, reject) => {
     exec(
-      `python ${filePath} ${ip} ${address} ${host}`,
+      `python3 ${filePath} ${ip} ${address} ${host}`,
       silent,
       (code, stdout, stderr) => {
-        if (typeof stdout === 'string') {
-          if (stdout.includes('ImportError: No module named spf'))
-            stderr = 'Please install "pyspf" locally using `pip install pyspf`';
-          else if (stdout.includes('ipaddr module required'))
-            stderr =
-              'Please install "ipaddr" locally using `pip install ipaddr`';
-          else if (stdout.includes('ImportError: No module named DNS'))
-            stderr = `Please install "dns" locally using \`pip install ${
-              semver.satisfies(version, '>= 3') ? 'py3dns' : 'pydns==2.3.4'
-            }\``;
-        }
-
         if (code !== 0) return reject(new Error(stderr));
         resolve(stdout.trim().split(','));
       }