A few linting and docs tweaks

Author: Plazmaz

.travis.yml

@@ -24,8 +24,9 @@ install:
 - pip install pytest
 - pip install -e .
 script:
+- wget https://raw.githubusercontent.com/kevthehermit/PasteHunter/master/settings.json.sample -O ~/.config/pastehunter.json
 - pastehunter-cli
-- pytest
+- python -m pytest
 after_success:
 - python setup.py sdist
 deploy:

README.md

@@ -3,10 +3,6 @@ PasteHunter is a python3 application that is designed to query a collection of s
 For all the pastes it finds it scans the raw contents against a series of Yara rules looking for information that can be used 
 by an organisation or a researcher.
 
-## Pastebin API Deprecated
-
-We are aware that the pastebin scraping API has been deprectated and are reviewing. 
-
 
 ## Setup 
 For setup instructions please see the official documentation https://pastehunter.readthedocs.io/en/latest/installation.html

conftest.py

@@ -63,6 +63,12 @@ Slexy has some heavy rate limits (30 requests per 30 seconds), but may still ret
 - **api_raw**: The URL endpoint for the raw paste.
 - **api_view**: The URL enpoint to view the paste.
 
+ix.io
+---------
+
+ix.io is a smaller site used primarily for console/command line pastes.
+
+- **store_all**: Store all pastes regardless of a rule match.
 
 StackExchange
 -------------

docs/inputs.rst

@@ -1,10 +1,7 @@
 import logging
 import re
 from datetime import datetime
-from time import sleep
-from typing import List, Any, Dict, Union
-
-import requests
+from typing import List, Any, Dict, Union, Pattern
 
 from common import base62_decode, base62_encode
 from inputs.base_input import BasePasteSite
@@ -18,7 +15,7 @@ class IxDotIoSite(BasePasteSite):
     # Capturing groups:
     # 1. Paste ID
     # 2. Timestamp
-    _ITEM_ID_RE: re.Pattern = re.compile('<div class="t">[\\sa-zA-Z0-9]+'
+    _ITEM_ID_RE: Pattern = re.compile('<div class="t">[\\sa-zA-Z0-9]+'
                                          '<a href="/(.*?)">\\[r][^\r\n]+'
                                          '\\s+@ (.*?)[\r\n]')
 

pastehunter/inputs/ixio.py

@@ -1,9 +1,11 @@
-from common import base62_decode, base62_encode
+from pastehunter.common import base62_decode, base62_encode
+
 
 def test_b62_encode():
     assert base62_encode(622708) == '2BZG'
     assert base62_encode(622707) == '2BZF'
 
+
 def test_b62_decode():
     assert base62_decode('1') == 1
     assert base62_decode('a') == 10

test/test_base62.py

@@ -1,9 +1,9 @@
-from inputs import slexy
 from inputs.pastebin import PastebinPasteSite
 from inputs.slexy import SlexyPasteSite
 
-
 pids_found = []
+
+
 def mock_get_paste_for_pid(pid):
     pids_found.append(pid)
     return "pid_is_" + pid