kallithea Changeset - 09cef303962b

Changeset - 09cef303962b

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-12-07 02:15:34
marcin@python-works.com

python2.5 safe parsing of datetime string with microseconds

1 file changed with 15 insertions and 2 deletions:

rhodecode/tests/functional/test_admin.py

0 comments (0 inline, 0 general)

rhodecode/tests/functional/test_admin.py

➞

Show inline comments

@@ @@ -14,19 +14,32 @@ FIXTURES = os.path.join(dn(dn(os.path.ab @@
 class TestAdminController(TestController):
     @classmethod
     def setup_class(cls):
         UserLog.query().delete()
         Session().commit()
         def strptime(val):
             fmt = '%Y-%m-%d %H:%M:%S'
             if '.' not in val:
                 return datetime.datetime.strptime(val, fmt)
             nofrag, frag = val.split(".")
             date = datetime.datetime.strptime(nofrag, fmt)
             frag = frag[:6]  # truncate to microseconds
             frag += (6 - len(frag)) * '0'  # add 0s
             return date.replace(microsecond=int(frag))
         with open(os.path.join(FIXTURES, 'journal_dump.csv')) as f:
             for row in csv.DictReader(f):
                 ul = UserLog()
                 for k, v in row.iteritems():
                     v = safe_unicode(v)
                     if k == 'action_date':
-                        v = datetime.datetime.strptime(v, '%Y-%m-%d %H:%M:%S.%f')
                         v = strptime(v)
                     if k in ['user_id', 'repository_id']:
                         #nullable due to FK problems
                         v = None
                     setattr(ul, k, v)
                 Session().add(ul)
             Session().commit()
@@ @@ -131,7 +144,7 @@ class TestAdminController(TestController @@
         response.mustcontain('47 entries')
     def test_filter_journal_filter_on_date_2(self):
         self.log_user()
         response = self.app.get(url(controller='admin/admin', action='index',
                                     filter='date:20121020'))
         response.mustcontain('17 entries')
@@ \ No newline at end of file @@
         response.mustcontain('17 entries')

0 comments (0 inline, 0 general)