EnDroid

Merge lp:~paul-stanley/endroid/endroid into lp:endroid

  1. endroid
  2. Merge into trunk
Proposed by Paul Stanley
Status: Superseded
Proposed branch: lp:~paul-stanley/endroid/endroid
Merge into: lp:endroid
Diff against target: 56 lines (+8/-5)
2 files modified
src/endroid/__init__.py (+5/-2)
src/endroid/plugins/memo.py (+3/-3)
To merge this branch: bzr merge lp:~paul-stanley/endroid/endroid
Reviewer Review Type Date Requested Status
Ryan (community) Approve
Review via email: mp+122701@code.launchpad.net

Description of the change

Add logging timestamping
Fix memo plugin

To post a comment you must log in.
Revision history for this message
Ryan (ryan-lothian+launchpad) wrote :

Looks good to me!

review: Approve
lp:~paul-stanley/endroid/endroid updated
29. By Paul Stanley

Fix accidental permission change

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/endroid/__init__.py' (properties changed: -x to +x)
2--- src/endroid/__init__.py 2012-09-03 17:55:29 +0000
3+++ src/endroid/__init__.py 2012-09-04 15:07:20 +0000
4@@ -26,6 +26,8 @@
5
6 __version__ = (1, 1)
7
8+LOGGING_FORMAT = '%(asctime)-15s %(message)s'
9+
10 class Endroid(object):
11 def __init__(self, conffile, logtraffic=False):
12 self.application = service.Application("EnDroid")
13@@ -134,9 +136,10 @@
14 args = parser.parse_args()
15
16 if args.logfile:
17- logging.basicConfig(filename=args.logfile, level=args.level)
18+ logging.basicConfig(filename=args.logfile, level=args.level,
19+ format=LOGGING_FORMAT)
20 else:
21- logging.basicConfig(level=args.level)
22+ logging.basicConfig(level=args.level, format=LOGGING_FORMAT)
23
24 cmd = args.conffile
25 env = os.environ.get("ENDROID_CONF", "")
26
27=== modified file 'src/endroid/plugins/memo.py' (properties changed: -x to +x)
28--- src/endroid/plugins/memo.py 2012-08-31 22:11:22 +0000
29+++ src/endroid/plugins/memo.py 2012-09-04 15:07:20 +0000
30@@ -84,7 +84,7 @@
31 return summary[:-1]
32
33 def _handle_delete(self, msg, args):
34- args = arg.split()
35+ args = args.split()
36 if len(args) != 1 or not args[0].isdigit():
37 msg.reply(MESSAGES['usage-delete'])
38 return
39@@ -116,7 +116,7 @@
40 msg.reply(MESSAGES['inbox-empty'])
41
42 def _handle_view(self, msg, args):
43- args = arg.split()
44+ args = args.split()
45 if len(args) != 1 or not args[0].isdigit():
46 msg.reply(MESSAGES['usage-view'])
47 return
48@@ -134,7 +134,7 @@
49 msg.reply(MESSAGES['view-message'].format(*data))
50
51 def _handle_send(self, msg, args):
52- args = arg.split()
53+ args = args.split()
54 if len(args) < 2:
55 msg.reply(MESSAGES['usage-send'])
56 return

Subscribers

People subscribed via source and target branches