Made importing more clear and removed unused parameters

run.py

@@ -2,4 +2,4 @@
 from sample.ldif_parser import *
 
 parse_all()
-write_ldif(residents)
+write_ldif()

sample/ldif_parser.py

@@ -1,4 +1,4 @@
-from sample.validator import *
+from data.data import ldif_file, residents
 
 
 def print_ldif_header(f, mail_list):
@@ -9,7 +9,7 @@ def print_ldif_header(f, mail_list):
     f.write('cn: ' + mail_list + '\n')
 
 
-def write_ldif(residents):
+def write_ldif():
     f = open(ldif_file, 'w')
 
     for mail_list in residents:

sample/mail_list_generator.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Contains all the excel and mail list data
-from data.data import *
+from data.data import list1, list2, divider, renters, again_renters, residents
 from sample.cleaner import clean
 from sample.validator import valid_email
 import json
@@ -19,7 +19,7 @@ def change_list_if_right(apartment):
         mail_list = list2
 
 
-def set_value(apartment, key, values):
+def set_value(values):
     if values:
         global residents
 
@@ -32,19 +32,19 @@ def set_value(apartment, key, values):
         residents[mail_list].extend(emails)
 
 
-def parse_emails(excel_sheet, mail_col, mail_entry, entry_required):
+def parse_emails(excel_sheet, mail_col):
     set_list_to(list1)
 
     for row in range(1, excel_sheet.nrows):
         apartment = clean(excel_sheet.cell(row, 0).value).replace(' ', '_')
         emails = clean(excel_sheet.cell(row, mail_col).value).replace(' ', '')
 
-        set_value(apartment, mail_entry, emails)
+        set_value(emails)
 
         change_list_if_right(apartment)
 
 
 def parse_all():
-    parse_emails(renters, 9, 'email', False)
-    parse_emails(again_renters, 3, 'tenant', True)
+    parse_emails(renters, 9)
+    parse_emails(again_renters, 3)
     #print(json.dumps(residents, indent=4, sort_keys=True))

sample/validator.py

@@ -1,12 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
 import re
 
-# Contains all the excel and mail list data
-from data.data import *
 from sample.cleaner import clean
-from sample.slack import *
+from sample.slack import slack_message, send_slack_notification
 
 
 def valid_email(email):

tests/integration/test_ldif_generation.py

@@ -10,7 +10,7 @@ class TestLdifGeneration(unittest.TestCase):
 
     def test_excel_with_invalid_values(self):
         parse_all()
-        write_ldif(residents)
+        write_ldif()
 
         list_of_files = glob.glob('data/ldif/*.ldif')
         latest_file = max(list_of_files, key=os.path.getctime)

validate.py

@@ -1,10 +1,5 @@
 from sample.validator import *
-
-# parse_all()
-
-# f = open(ldif_file, 'w')
-# write_ldif(residents)
-# f.close()
+from data.data import renters, again_renters
 
 validate_emails(renters, 9)
 validate_emails(again_renters, 3)