← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Martin Pool
  • Date: 2009-06-19 09:06:56 UTC
  • mfrom: (4463 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4464.
  • Revision ID: mbp@sourcefrog.net-20090619090656-d5weqeecyscv8kqp
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
722
722
               _format_date(t, offset, timezone, date_fmt, show_offset)
723
723
    date_str = time.strftime(date_fmt, tt)
724
724
    if not isinstance(date_str, unicode):
725
 
        date_str = date_str.decode(bzrlib.user_encoding, 'replace')
 
725
        date_str = date_str.decode(get_user_encoding(), 'replace')
726
726
    return date_str + offset_str
727
727
 
728
728
def _format_date(t, offset, timezone, date_fmt, show_offset):