/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/rio.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-14 15:01:19 UTC
  • mto: (4526.2.4 1.17)
  • mto: This revision was merged to the branch mainline in revision 4554.
  • Revision ID: john@arbash-meinel.com-20090714150119-mbalfuwuwhbkpn8r
instead of updating PYTHONPATH in Makefile, update generate_docs to find bzrlib.
PYTHONPATH cannot be set portably between OSes (win32 requires ';' separation, versus ':'
on other platforms.)
Rather than work out how to get platform independent Makefile, just do it in python.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/rio.py
32
32
 
33
33
import re
34
34
 
35
 
from bzrlib import osutils
36
35
from bzrlib.iterablefile import IterableFile
37
36
 
38
37
# XXX: some redundancy is allowing to write stanzas in isolation as well as
378
377
        _read_stanza_unicode,
379
378
        _valid_tag,
380
379
        )
381
 
except ImportError, e:
382
 
    osutils.failed_to_load_extension(e)
 
380
except ImportError:
383
381
    from bzrlib._rio_py import (
384
382
       _read_stanza_utf8,
385
383
       _read_stanza_unicode,