ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/306200
Change subject: scheduler: move methods out into module that don't need 'self'
......................................................................
scheduler: move methods out into module that don't need 'self'
Change-Id: I7b97ffbc9396d1def0aee2b5f1a4bcc25e62dae7
---
M xmldumps-backup/dumpscheduler.py
1 file changed, 17 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps
refs/changes/00/306200/1
diff --git a/xmldumps-backup/dumpscheduler.py b/xmldumps-backup/dumpscheduler.py
index 8838779..3d29d4b 100644
--- a/xmldumps-backup/dumpscheduler.py
+++ b/xmldumps-backup/dumpscheduler.py
@@ -56,6 +56,22 @@
return obj.__dict__
+def format_convert(names_values):
+ '''
+ expect a string like name1=val1,name2=val2...
+ return a dict {'name1': 'val1', 'name2': 'val2'...}
+ suitable for use by format()
+ '''
+ if names_values is None:
+ return names_values
+ pairs = names_values.split(',')
+ converted = {}
+ for pair in pairs:
+ name, val = pair.split('=')
+ converted[name] = val
+ return converted
+
+
class Scheduler(object):
'''
handle running a sequence of commands, each command possibly to
@@ -87,7 +103,7 @@
self.pid, os.geteuid())
self.my_prefix = 'PYMGR_ID'
self.email_from = email_from
- self.formatvars = self.format_convert(formatvars)
+ self.formatvars = format_convert(formatvars)
def handle_hup(self, signo_unused, frame_unused):
"""
@@ -116,21 +132,6 @@
except IOError:
pass
os.execv(sys.executable, [sys.executable] + sys.argv)
-
- def format_convert(self, names_values):
- '''
- expect a string like name1=val1,name2=val2...
- return a dict {'name1': 'val1', 'name2': 'val2'...}
- suitable for use by format()
- '''
- if names_values is None:
- return names_values
- pairs = names_values.split(',')
- converted = {}
- for pair in pairs:
- name, val = pair.split('=')
- converted[name] = val
- return converted
def run(self):
'''
--
To view, visit https://gerrit.wikimedia.org/r/306200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b97ffbc9396d1def0aee2b5f1a4bcc25e62dae7
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
