From 82a54b8f41dcd81cbb6f7889493ebf0fc3daf4cc Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Fri, 22 Nov 2019 16:39:31 -0500 Subject: [PATCH] Re-arrange import ordering --- doorUpdater.py | 2 +- hid/DoorController.py | 3 ++- ucsAccounts.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doorUpdater.py b/doorUpdater.py index ddcd46e..70f6298 100755 --- a/doorUpdater.py +++ b/doorUpdater.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 from common import doors, getMembershipworksData, memberLevels -from hid.DoorController import E, ROOT from hid.Credential import Credential +from hid.DoorController import ROOT, E class Member(): diff --git a/hid/DoorController.py b/hid/DoorController.py index 3b34e83..c1aa7bc 100644 --- a/hid/DoorController.py +++ b/hid/DoorController.py @@ -1,8 +1,9 @@ import csv from io import StringIO + +import requests from lxml import etree from lxml.builder import ElementMaker -import requests E_plain = ElementMaker(nsmap={"hid": "http://www.hidglobal.com/VertX"}) E = ElementMaker(namespace="http://www.hidglobal.com/VertX", diff --git a/ucsAccounts.py b/ucsAccounts.py index f3a2876..ea83093 100755 --- a/ucsAccounts.py +++ b/ucsAccounts.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 import random import re -import subprocess import string +import subprocess -from common import * +from common import getMembershipworksData LDAP_BASE = "cn=users,dc=sawtooth,dc=claremontmakerspace,dc=org" GROUP_BASE = "cn=groups,dc=sawtooth,dc=claremontmakerspace,dc=org"