.

facebook/arangodb.py

@@ -7,35 +7,35 @@ from json2html import json2html
 
 from arango import ArangoClient
 
-from config import *
+from config import user_arango, db_arango, host_arango, port_arango, url_bas
+try:
+    from config import pwd
+except:
+    print('\nKunde inte importera lösenord från config.\n')
 
-if __name__ == '__main__.py':
+if __name__ != '__main__.py':
     for i in range(0, 6, 1):
         if i == 5:
-            exit()
+            exit('Fel lösenord, kunde inte logga in i DB.')
-        try:
-            # Om scriptet körs på Macbook finns lösenordet i en fil
-            with open("../password_arango.txt") as f:
-                pwd = f.readline()
-        except FileNotFoundError:
         if 'pwd' not in globals():
             pwd = getpass(f'Lösenord för {user_arango}: ')
         
         try:
-            db = ArangoClient(hosts=host_arango).db(db_arango, username=user_arango, password=pwd)
+            db = ArangoClient(hosts=f'{host_arango}:{port_arango}').db(db_arango, username=user_arango, password=pwd)
             db.collection('members').random() # För att testa löseordet/kopplingen.
             break
         except:
             print("Fel lösenord.")
             sleep(1)
+        
 else:
-    db = None # Om db importeras separat.
+    db = None # ArangoClient(hosts='http://192.168.1.10:8529').db(db_arango, username=user_arango, password=getpass(f'Lösenord för {user_arango}: ')) #None # Om db importeras separat.
 
 from helpers import now, _print, nowstamp, sleep_
 from classes import Profile
 
 
-def arango_connect(pwd, username='Lasse', db_arango = 'facebook', host_arango='http://192.168.1.20', port_arango='8529'):
+def arango_connect(pwd, username='Lasse', db_arango = 'facebook', host_arango='http://192.168.1.10', port_arango='8529'):
     return ArangoClient(hosts=f'{host_arango}:{port_arango}').db(
         db_arango, username=username, password=pwd, 
     )

facebook/config.py

@@ -1,4 +1,5 @@
 from getpass import getpass
+
 def set_pwd(_pwd=None):
     global pwd
     if _pwd == None:
@@ -8,7 +9,7 @@ def set_pwd(_pwd=None):
 # Info för arangodb
 user_arango = "Lasse"
 db_arango = "facebook"
-host_arango = 'http://192.168.1.20'
+host_arango = 'http://192.168.1.10'
 port_arango = '8529'
 
 # Andra uppgifter

requirements.txt

@@ -3,7 +3,7 @@ certifi==2020.12.5
 cffi==1.14.5
 chardet==4.0.0
 idna==2.10
-lxml==4.6.2
+lxml
 pycparser==2.20
 PyJWT==2.0.1
 #PyNaCl==1.4.0