/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-17 19:10:35 UTC
  • mfrom: (4454 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4461.
  • Revision ID: john@arbash-meinel.com-20090617191035-0vztgazsdwa3mwg4
Merge bzr.dev 4454 in prep for 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):
1841
1841
    def _local_concurrency():
1842
1842
        return subprocess.Popen(['sysctl', '-n', 'hw.availcpu'],
1843
1843
                                stdout=subprocess.PIPE).communicate()[0]
 
1844
elif sys.platform[0:7] == 'freebsd':
 
1845
    def _local_concurrency():
 
1846
        return subprocess.Popen(['sysctl', '-n', 'hw.ncpu'],
 
1847
                                stdout=subprocess.PIPE).communicate()[0]
1844
1848
elif sys.platform == 'sunos5':
1845
1849
    def _local_concurrency():
1846
1850
        return subprocess.Popen(['psrinfo', '-p',],