From 3cce9d7478760c4df356bb609485e2740f1f7d99 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 20 Dec 2018 13:16:40 +0100
Subject: [PATCH] Use YAML formatted variable file

---
 WAPT/control | 2 +-
 setup.py     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WAPT/control b/WAPT/control
index 0f7cbe8..76cab8f 100644
--- a/WAPT/control
+++ b/WAPT/control
@@ -1,5 +1,5 @@
 package           : fws-tightvnc-server
-version           : 2.8.11-3
+version           : 2.8.11-4
 architecture      : all
 section           : base
 priority          : optional
diff --git a/setup.py b/setup.py
index 61199d0..150f1df 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 from setuphelpers import *
-from cryptography.fernet import Fernet
-import json
 import re
 
 uninstallkey = []
@@ -15,8 +13,10 @@ variables = {
 # Read local variables file if available
 if isfile(makepath(programfiles32,'wapt','private','symetric.txt')) and isfile(makepath(programfiles32,'wapt','private','variables.txt')):
     print('Reading local encrypted variables file')
+    from cryptography.fernet import Fernet
+    import yaml
     f = Fernet(open(makepath(programfiles32,'wapt','private','symetric.txt'),'r').read())
-    variables.update(json.loads(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
+    variables.update(yaml.safe_load(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
 
 def install():
     print('Installing TightVNC Server')