← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/python-django/oneiric

« back to all changes in this revision

Viewing changes to django/db/backends/util.py

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge
  • Date: 2011-02-17 13:34:07 UTC
  • mfrom: (1.1.13 upstream) (4.4.12 sid)
  • Revision ID: james.westby@ubuntu.com-20110217133407-rwr88elhhq6j7ba0
Tags: 1.2.5-1ubuntu1
https://launchpad.net/bugs/719031
* Merge from Debian for security fixes (LP: #719031). Remaining changes:
  - debian/control: don't Build-Depends on locales-all, which doesn't exist
    in natty
* Drop the following patches, now included upstream:
  - debian/patches/07_security_admin_infoleak.diff
  - debian/patches/08_security_pasword_reset_dos.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/db/backends/util.py
81
81
    else:
82
82
        microseconds = '0'
83
83
    return datetime.datetime(int(dates[0]), int(dates[1]), int(dates[2]),
84
 
        int(times[0]), int(times[1]), int(seconds), int(float('.'+microseconds) * 1000000))
 
84
        int(times[0]), int(times[1]), int(seconds), int((microseconds + '000000')[:6]))
85
85
 
86
86
def typecast_boolean(s):
87
87
    if s is None: return None