Skip to content

Commit

Permalink
Merge remote-tracking branch 'toabctl/master'
Browse files Browse the repository at this point in the history
Conflicts:
    jiracli
Benoit Latinier committed Oct 31, 2014
2 parents 313037c + da3d126 commit c4714dc
Showing 2 changed files with 11 additions and 3 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
language: python
python:
- "2.7"
install:
- pip install pep8
script:
- pep8 jiracli
7 changes: 4 additions & 3 deletions jiracli
Original file line number Diff line number Diff line change
@@ -24,9 +24,9 @@ import argparse
import ConfigParser
import logging
import getpass
import datetime
import tabulate
from collections import OrderedDict
from datetime import datetime
from termcolor import colored as colorfunc
from jira.client import JIRA
import tempfile
@@ -140,8 +140,9 @@ def dtstr2dt(dtstr):
"""nicer datetime string
jira delivers something like '2013-11-07T16:13:24.000+0100'"""
# TODO: maybe %c is not the best formatter.
# Output depends on current locale.
return datetime.strptime(dtstr[:-9], "%Y-%m-%dT%H:%M:%S").strftime("%c")
# Output depends on current locale
return datetime.datetime.strptime(dtstr[:-9],
"%Y-%m-%dT%H:%M:%S").strftime("%c")


def issue_status_color(status):

0 comments on commit c4714dc

Please sign in to comment.