From bd4fc909be410548283cb5d6f0d8a7eeaccc4405 Mon Sep 17 00:00:00 2001
From: Folker Bernitt <fbernitt@thoughtworks.com>
Date: Thu, 2 Apr 2015 17:12:29 +0200
Subject: Removed unused certs_home code.

---
 service/pixelated/bitmask_libraries/certs.py    | 1 -
 service/pixelated/bitmask_libraries/config.py   | 3 +--
 service/pixelated/bitmask_libraries/register.py | 3 +--
 service/pixelated/bitmask_libraries/session.py  | 4 +---
 4 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'service/pixelated/bitmask_libraries')

diff --git a/service/pixelated/bitmask_libraries/certs.py b/service/pixelated/bitmask_libraries/certs.py
index 61771cec..a321e00e 100644
--- a/service/pixelated/bitmask_libraries/certs.py
+++ b/service/pixelated/bitmask_libraries/certs.py
@@ -47,7 +47,6 @@ class LeapCertificate(object):
     def __init__(self, provider):
         self._config = provider.config
         self._server_name = provider.server_name
-        self._certs_home = self._config.certs_home
         self._provider = provider
 
     def auto_detect_bootstrap_ca_bundle(self):
diff --git a/service/pixelated/bitmask_libraries/config.py b/service/pixelated/bitmask_libraries/config.py
index 56f28706..8c862d0a 100644
--- a/service/pixelated/bitmask_libraries/config.py
+++ b/service/pixelated/bitmask_libraries/config.py
@@ -45,7 +45,7 @@ class LeapConfig(object):
     def __init__(self, leap_home=DEFAULT_LEAP_HOME, bootstrap_ca_cert_bundle=AUTO_DETECT_CA_BUNDLE,
                  ca_cert_bundle=AUTO_DETECT_CA_BUNDLE, verify_ssl=True,
                  fetch_interval_in_s=30,
-                 timeout_in_s=15, start_background_jobs=False, gpg_binary=discover_gpg_binary(), certs_home=None):
+                 timeout_in_s=15, start_background_jobs=False, gpg_binary=discover_gpg_binary()):
         """
         Constructor.
 
@@ -75,7 +75,6 @@ class LeapConfig(object):
 
         """
         self.leap_home = leap_home
-        self.certs_home = certs_home
         self.bootstrap_ca_cert_bundle = bootstrap_ca_cert_bundle
         self.ca_cert_bundle = ca_cert_bundle
         self.verify_ssl = verify_ssl
diff --git a/service/pixelated/bitmask_libraries/register.py b/service/pixelated/bitmask_libraries/register.py
index 258394da..bb54477f 100644
--- a/service/pixelated/bitmask_libraries/register.py
+++ b/service/pixelated/bitmask_libraries/register.py
@@ -25,8 +25,7 @@ from pixelated.bitmask_libraries.auth import LeapAuthenticator, LeapCredentials
 
 
 def register_new_user(username, server_name):
-    certs_home = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "certificates"))
-    config = LeapConfig(certs_home=certs_home)
+    config = LeapConfig()
     provider = LeapProvider(server_name, config)
     password = getpass.getpass('Please enter password for %s: ' % username)
     LeapAuthenticator(provider).register(LeapCredentials(username, password))
diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py
index c0c8f712..eb6f39d7 100644
--- a/service/pixelated/bitmask_libraries/session.py
+++ b/service/pixelated/bitmask_libraries/session.py
@@ -37,9 +37,7 @@ SESSIONS = {}
 
 
 def open(username, password, server_name, leap_home=DEFAULT_LEAP_HOME):
-    certs_home = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "certificates"))
-
-    config = LeapConfig(leap_home=leap_home, certs_home=certs_home)
+    config = LeapConfig(leap_home=leap_home)
     provider = LeapProvider(server_name, config)
     refresh_ca_bundle(provider)
     session = LeapSessionFactory(provider).create(LeapCredentials(username, password))
-- 
cgit v1.2.3