Copy remaining stuff from YarnHelper to lib.py

1 files changed, 6 insertions, 12 deletions

diff --git a/900-implements.yarn b/900-implements.yarn
index 31cec0c..976e0ce 100644
--- a/900-implements.yarn
+++ b/900-implements.yarn
@@ -8,10 +8,9 @@
 ## HTTP requests
 
     IMPLEMENTS WHEN user fetches (\S+)
-    h = yarnhelper.YarnHelper()
     address = os.environ['ADDRESS']
     url = get_next_match()
-    status, body = h.http_get(address, url)
+    status, body = http_get(address, url)
     vars['http_status'] = status
     vars['http_body'] = body
 
@@ -87,7 +86,6 @@
 ## Send mail over SMTP+TLS
 
     IMPLEMENTS WHEN someone sends mail to (\S+) with subject \$(\S+)
-    import smtplib
     to_addr = get_next_match()
     subject_key = get_next_match()
     subject = vars[subject_key]
@@ -105,7 +103,6 @@
 ## Check for a mail in a mailbox
 
     IMPLEMENTS THEN mailbox of (\S+) has a mail with subject \$(\S+)
-    h = yarnhelper.YarnHelper()
     user = get_next_match()
     subject_key = get_next_match()
     subject = vars[subject_key]
@@ -113,19 +110,18 @@
     address = os.environ['ADDRESS']
     pass_name = 'pieni.net/{}'.format(user)
     pass_home = os.environ['PASS_HOME']
-    password = h.get_password_with_pass(pass_home, pass_name)
+    password = get_password_with_pass(pass_home, pass_name)
     got_it = False
     def match(imapobj, msgid, msg):
         global got_it
         print 'Subject:', msg['Subject']
         got_it = got_it or (msg['Subject'] == subject)
-    h.iterate_mails_in_imap_mailbox(address, user, password, match, False)
+    iterate_mails_in_imap_mailbox(address, user, password, match, False)
     assertTrue(got_it)
 
 ## Delete mails
 
     IMPLEMENTS THEN mails for (\S+) with subject \$(\S+) get deleted
-    h = yarnhelper.YarnHelper()
     user = get_next_match()
     subject_key = get_next_match()
     subject = vars[subject_key]
@@ -133,11 +129,11 @@
     address = os.environ['ADDRESS']
     pass_name = 'pieni.net/{}'.format(user)
     pass_home = os.environ['PASS_HOME']
-    password = h.get_password_with_pass(pass_home, pass_name)
+    password = get_password_with_pass(pass_home, pass_name)
     def delete_matching(imapobj, msgid, msg):
         if msg['Subject'] == subject:
             imapobj.store(msgid, '+FLAGS', '(\\Deleted)')
-    h.iterate_mails_in_imap_mailbox(
+    iterate_mails_in_imap_mailbox(
         address, user, password, delete_matching, True)
 
 ## Run sequence of SMTP commands, check SMTP status
@@ -155,15 +151,13 @@
     vars['smtp_commands'] = smtp_commands
 
     IMPLEMENTS THEN SMTP status code is (\d+)
-    import smtplib
-    h = yarnhelper.YarnHelper()
     wanted_status = int(get_next_match())
     smtp_commands = vars['smtp_commands']
     smtp_username = vars['smtp_username']
     if smtp_username is not None:
         pass_home = os.environ['PASS_HOME']
         pass_user = 'pieni.net/{}'.format(smtp_username)
-        smtp_password = h.get_password_with_pass(pass_home, pass_user)
+        smtp_password = get_password_with_pass(pass_home, pass_user)
     address = os.environ['ADDRESS']
     server = smtplib.SMTP()
     print 'connecting to', address