conf stuff

auth.py

@@ -9,7 +9,7 @@ def checkLogin():
     #f = open('cookies','rb')
     sess = requests.session()
     #sess.cookies.update(pickle.load(f))
-    response = sess.get('https://proxer.me/ucp')
+    response = sess.get(config['urls']['base_url']'/ucp')
     data = response.content
     dump = open('dummys/ucp_loggedout.html','w')
     dump.write(str(data))
@@ -19,11 +19,7 @@ def checkLogin():
 def login(user,passw,config):
     sess = requests.Session()
     #obtain token
-<<<<<<< HEAD
-    response = requests.get('https://proxer.me/')
-=======
     response = requests.get(config['urls']['base_url'])
->>>>>>> b6b84fdc3318b4f7255a1d972fff99fbf9a7c180
     data = response.content
     tparse = tokenParser()
     tparse.feed(str(data))

main.py

@@ -189,7 +189,7 @@ def episode(sess,ep):
 def LesezeichenAll(sess):
     watchlist = []
     readlist = []
-    response = sess.get('https://proxer.me/ucp?s=reminder&utm_source=nav#top')
+    response = sess.get(config['urls']['base_url']+'/ucp?s=reminder&utm_source=nav#top')
     lpars = lesezeichenParser()
     lpars.watchlist = []
     lpars.readlist = []
@@ -215,7 +215,7 @@ def LesezeichenAll(sess):
     
 
 def LesezeichenSingle(sess,mode):
-    response = sess.get('https://proxer.me/ucp?s=reminder&utm_source=nav#top')
+    response = sess.get(config['urls']['base_url']+'/ucp?s=reminder&utm_source=nav#top')
     lpars = lesezeichenParser()
     content = response.content
     lpars.feed(str(content))
@@ -231,7 +231,7 @@ def LesezeichenSingle(sess,mode):
         print(str(i) + ' - ' + plist[i]['name'] + ' - ' + str(plist[i]['new']))
     uin = input('$>: ')
     link = plist[int(uin)]['link']
-    url = 'https://proxer.me'+link
+    url = config['urls']['base_url']+link
     print(link)
     print(url)
     f = open('episode.html','w')