Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/81006
Change subject: fix up harmless pep8 errors
......................................................................
fix up harmless pep8 errors
This patch deals with whitespaces errors reported by pep8 as well as
multiline imports that should be split on their own lines.
Change-Id: I4a45972b71f851a2451dc4c1bd8037e4fb3bfa7e
---
M scripts/homedirectorymanager.py
M scripts/ldapsupportlib.py
M scripts/mail-instance-creator.py
M scripts/puppetsigner.py
4 files changed, 48 insertions(+), 22 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/06/81006/1
diff --git a/scripts/homedirectorymanager.py b/scripts/homedirectorymanager.py
index b594cbb..ee46968 100755
--- a/scripts/homedirectorymanager.py
+++ b/scripts/homedirectorymanager.py
@@ -1,5 +1,15 @@
#!/usr/bin/python
-import sys, traceback, os, datetime, ldapsupportlib, shutil, pwd, re, pycurl
+
+import datetime
+import ldapsupportlib
+import os
+import pwd
+import pycurl
+import re
+import shutil
+import sys
+import traceback
+
from optparse import OptionParser
from cStringIO import StringIO
@@ -9,6 +19,7 @@
except ImportError:
sys.stderr.write("Unable to import LDAP library.\n")
sys.exit(1)
+
class HomeDirectoryManager:
@@ -72,7 +83,7 @@
# We are going to use a dictionary (associative array)
as a hash bucket (keys pointing to dictionaries)
# for the AllUsers data structure.
# The data structure will look like this:
- # {"<uid>": {"uidNumber": <uidNumber>, "gidNumber":
<gidNumber>, "sshPublicKey": ['key1', 'key2']},
+ # {"<uid>": {"uidNumber": <uidNumber>, "gidNumber":
<gidNumber>, "sshPublicKey": ['key1', 'key2']},
# "<uid>": {"uidNumber": <uidNumber>, "gidNumber":
<gidNumber>, "sshPublicKey": ['key1', 'key2']}}
AllUsers = {}
for user in UsersData:
@@ -126,13 +137,13 @@
alreadyCreated.append(user)
continue
if not os.path.exists(self.basedir + user):
- self.log( "Creating a home directory
for %s at %s%s" % (user, self.basedir, user) )
+ self.log("Creating a home directory for
%s at %s%s" % (user, self.basedir, user))
if not self.dryRun:
os.mkdir(self.basedir + user,
0700)
os.mkdir(self.basedir + user +
'/.ssh', 0700)
self.writeKeys(user,
users[user]['sshPublicKey'])
os.chmod(self.basedir + user +
'/.ssh/authorized_keys', 0600)
- for skeldir,skels in
self.skelFiles.iteritems():
+ for skeldir, skels in
self.skelFiles.iteritems():
for skel in skels:
shutil.copy(skeldir + skel, self.basedir + user + "/")
os.chmod(self.basedir + user + "/" + skel, 0600)
@@ -146,7 +157,7 @@
os.chown(os.path.join(root, name), newUid, newGid)
if alreadyCreated != []:
- self.log( "The following users already have a home
directory in the SAVE directory: " + ", ".join(alreadyCreated) )
+ self.log("The following users already have a home
directory in the SAVE directory: " + ", ".join(alreadyCreated))
def fetchKeys(self, location):
keys = []
@@ -202,16 +213,16 @@
self.deleteUser(userdir)
def renameUser(self, olduserdir, newuserdir):
- self.log( "Moving " + self.basedir + olduserdir + " to " +
self.basedir + newuserdir )
+ self.log("Moving " + self.basedir + olduserdir + " to " +
self.basedir + newuserdir)
if not self.dryRun:
os.rename(self.basedir + olduserdir, self.basedir +
newuserdir)
def deleteUser(self, userdir):
# User has been deleted, move user's home directory to SAVE
if os.path.isdir(self.savedir + userdir):
- self.log( userdir + " exists at both " + self.basedir +
userdir + " and " + self.savedir + userdir )
+ self.log(userdir + " exists at both " + self.basedir +
userdir + " and " + self.savedir + userdir)
else:
- self.log( "Moving " + self.basedir + userdir + " to " +
self.savedir + userdir )
+ self.log("Moving " + self.basedir + userdir + " to " +
self.savedir + userdir)
if not self.dryRun:
os.rename(self.basedir + userdir, self.savedir
+ userdir)
@@ -223,7 +234,7 @@
gid = stat.st_gid
if userdir in users.keys() and
users[userdir]["gidNumber"] != gid:
newGid = users[userdir]["gidNumber"]
- self.log( "Changing group ownership of
%s%s to %s; was set to %s" % (self.basedir, userdir, newGid, gid) )
+ self.log("Changing group ownership of
%s%s to %s; was set to %s" % (self.basedir, userdir, newGid, gid))
if not self.dryRun:
# Python doesn't have a
recursive chown, so we have to walk the directory
# and change everything manually
@@ -243,7 +254,7 @@
uid = stat.st_uid
if userdir in users.keys() and
users[userdir]["uidNumber"] != uid:
newUid = users[userdir]["uidNumber"]
- self.log( "Changing ownership of %s%s
to %s; was set to %s" % (self.basedir, userdir, newUid, uid) )
+ self.log("Changing ownership of %s%s to
%s; was set to %s" % (self.basedir, userdir, newUid, uid))
if not self.dryRun:
# Python doesn't have a
recursive chown, so we have to walk the directory
# and change everything manually
@@ -255,12 +266,13 @@
os.chown(os.path.join(root, name), newUid, -1)
def log(self, logstring):
- print datetime.datetime.now().strftime("%m/%d/%Y - %H:%M:%S -
") + logstring
+ print datetime.datetime.now().strftime("%m/%d/%Y - %H:%M:%S -
") + logstring
def logDebug(self, logstring):
- if self.debugStatus == True:
+ if self.debugStatus == True:
sys.stderr.write("Debug: " + logstring + "\n")
+
def main():
homeDirectoryManager = HomeDirectoryManager()
homeDirectoryManager.run()
diff --git a/scripts/ldapsupportlib.py b/scripts/ldapsupportlib.py
index 8ce78bc..a195c91 100755
--- a/scripts/ldapsupportlib.py
+++ b/scripts/ldapsupportlib.py
@@ -1,11 +1,16 @@
#!/usr/bin/python
-import os, traceback, getpass, sys
+
+import getpass
+import os
+import sys
+import traceback
try:
import ldap
except ImportError:
sys.stderr.write("Unable to import LDAP library.\n")
sys.exit(1)
+
class LDAPSupportLib:
@@ -23,15 +28,15 @@
parser.add_option("-m", "--directorymanager",
action="store_true", dest="directorymanager", help="Use the Directory Manager's
credentials")
parser.add_option("--scriptuser", action="store_true",
dest="scriptuser", help="Use the scriptusers' credentials")
self.defaults['authuser'] = "proxy"
- if ( default == "user" ):
+ if (default == "user"):
self.defaults['authuser'] = "user"
- if ( default == "Directory Manager" ):
+ if (default == "Directory Manager"):
self.defaults['authuser'] = "Directory Manager"
- if ( default == "scriptuser" ):
+ if (default == "scriptuser"):
self.defaults['authuser'] = "scriptuser"
def getUsers(self, ds, username):
- PosixData = ds.search_s("ou=people," +
self.base,ldap.SCOPE_SUBTREE,"(&(objectclass=inetOrgPerson)(uid=" + username +
"))")
+ PosixData = ds.search_s("ou=people," + self.base,
ldap.SCOPE_SUBTREE, "(&(objectclass=inetOrgPerson)(uid=" + username + "))")
return PosixData
def getKeys(self, ds, username):
@@ -98,7 +103,7 @@
def connect(self):
try:
ds = ldap.initialize(self.ldapHost)
- ds.protocol_version=ldap.VERSION3
+ ds.protocol_version = ldap.VERSION3
if self.sslType == "start_tls":
ds.start_tls_s()
except Exception:
@@ -107,7 +112,7 @@
sys.exit(1)
try:
- ds.simple_bind_s(self.binddn,self.bindpw)
+ ds.simple_bind_s(self.binddn, self.bindpw)
return ds
except ldap.CONSTRAINT_VIOLATION:
sys.stderr.write("You typed your password incorrectly
too many times, and are now locked out. Please try again later.\n")
diff --git a/scripts/mail-instance-creator.py b/scripts/mail-instance-creator.py
index b87d21e..074683b 100755
--- a/scripts/mail-instance-creator.py
+++ b/scripts/mail-instance-creator.py
@@ -4,7 +4,8 @@
from xml.dom import minidom
from optparse import OptionParser
-from socket import gethostname;
+from socket import gethostname
+
def main():
parser = OptionParser(conflict_handler="resolve")
diff --git a/scripts/puppetsigner.py b/scripts/puppetsigner.py
index e828a6f..40f9251 100755
--- a/scripts/puppetsigner.py
+++ b/scripts/puppetsigner.py
@@ -1,12 +1,19 @@
#!/usr/bin/python
-import sys, traceback, ldapsupportlib, pwd, subprocess, os
+
+import ldapsupportlib
+import os
+import pwd
+import subprocess
+import sys
+import traceback
from optparse import OptionParser
-try:
+try:
import ldap
except ImportError:
sys.stderr.write("Unable to import LDAP library.\n")
sys.exit(1)
+
def main():
parser = OptionParser(conflict_handler="resolve")
@@ -50,6 +57,7 @@
ds.unbind()
sys.exit(0)
+
def getPuppetInfo(attr, conffile="/etc/puppet/puppet.conf"):
f = open(conffile)
for line in f:
--
To view, visit https://gerrit.wikimedia.org/r/81006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a45972b71f851a2451dc4c1bd8037e4fb3bfa7e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
