diff options
| author | Markus Krogh <markus@nordu.net> | 2017-07-15 00:06:53 +0200 |
|---|---|---|
| committer | Markus Krogh <markus@nordu.net> | 2017-07-15 00:06:53 +0200 |
| commit | d6d35ff6415f743397d04fb3d75d610d1a833dd6 (patch) | |
| tree | 649449e753e5af6b81e5215cbb1e416cf816f450 | |
| parent | 3062d98f2c0db4d37953fdacc3f68f51572958b0 (diff) | |
python3 support
| -rw-r--r-- | maconomy/cli.py | 4 | ||||
| -rw-r--r-- | maconomy/models.py | 6 | ||||
| -rw-r--r-- | maconomy_hours.py | 18 | ||||
| -rw-r--r-- | requirements.txt | 1 |
4 files changed, 17 insertions, 12 deletions
diff --git a/maconomy/cli.py b/maconomy/cli.py index 426e826..69cc174 100644 --- a/maconomy/cli.py +++ b/maconomy/cli.py @@ -1,5 +1,6 @@ import argparse -from ConfigParser import SafeConfigParser +from configparser import SafeConfigParser + def parse(): parser = argparse.ArgumentParser(description="Notifies people of missing hours registration") @@ -10,6 +11,7 @@ def parse(): parser.add_argument("--summary", action="store_true", default=False, help="Prints unsubmitted, missing and non approved status") return parser.parse_args() + def load_config(conf_file): config = SafeConfigParser() config.read(conf_file) diff --git a/maconomy/models.py b/maconomy/models.py index e9044ab..820014d 100644 --- a/maconomy/models.py +++ b/maconomy/models.py @@ -11,7 +11,11 @@ class Employee: return cls(id, name, email) def __unicode__(self): - return u"{} ({})".format(unicode(self.name,"ISO-8859-1"), self.id) + if type(self.name) is not unicode: + name = unicode(self.name,"ISO-8859-1") + else: + name = self.name + return u"{} ({})".format(name, self.id) class Timesheet: diff --git a/maconomy_hours.py b/maconomy_hours.py index 61fa6ee..608d502 100644 --- a/maconomy_hours.py +++ b/maconomy_hours.py @@ -37,10 +37,10 @@ def normal(timesheets, config, mailer): if to and to.strip(): mailer.send(to, subject, mail) else: - print u"No email for: {}".format(timesheet.employee) + print(u"No email for: {}".format(timesheet.employee)) else: - print subject - print mail + print(subject) + print(mail) def manager(timesheets, config, mailer): view = ManagerEmailView(config) @@ -56,9 +56,9 @@ def manager(timesheets, config, mailer): if mailer: mailer.send(to, subject, mail) else: - print "TO: {}".format(to) - print subject - print mail + print("TO: {}".format(to)) + print(subject) + print(mail) def ceo(timesheets, config, mailer): @@ -71,14 +71,14 @@ def ceo(timesheets, config, mailer): if mailer: mailer.send(to, subject, mail) else: - print mail + print(mail) def summary(timesheets): affected = [t for t in timesheets if not t.is_done()] for timesheet in affected: - print timesheet.status_summary() - print "Number of overdue timesheets: {}".format(len(affected)) + print(timesheet.status_summary()) + print("Number of overdue timesheets: {}".format(len(affected))) if __name__ == '__main__': diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index a491756..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -cx_Oracle |