Merge branch 'master' into master

This commit is contained in:
Christian Martorella 2018-10-27 21:01:55 +02:00 committed by GitHub
commit 44d4d68990
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View file

@ -9,9 +9,9 @@ class search_pgp:
def __init__(self, word):
self.word = word
self.results = ""
#self.server = "pgp.mit.edu"
self.server = "pgp.rediris.es"
self.hostname = "pgp.rediris.es"
self.server = "pgp.mit.edu"
#self.server = "pgp.rediris.es"
self.hostname = "pgp.mit.edu"
self.userAgent = "(Mozilla/5.0 (Windows; U; Windows NT 6.0;en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6"
def process(self):
@ -26,6 +26,7 @@ def process(self):
returncode, returnmsg, headers = h.getreply()
self.results = h.getfile().read()
except Exception, e:
print "Unable to connect to PGP server: ",str(e)
pass
def get_emails(self):

1
requirements.txt Normal file
View file

@ -0,0 +1 @@
requests==2.18.4