← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-13 15:05:42 UTC
  • mfrom: (6015.44.10 2.4)
  • mto: (6437.3.1 2.5)
  • mto: This revision was merged to the branch mainline in revision 6439.
  • Revision ID: v.ladeuil+lp@free.fr-20120113150542-510rp0ep0fa2zqoz
Merge 2.4 into 2.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
73
73
"""
74
74
 
75
75
from __future__ import absolute_import
76
 
 
 
76
from cStringIO import StringIO
77
77
import os
78
78
import sys
79
79
 
83
83
lazy_import(globals(), """
84
84
import fnmatch
85
85
import re
86
 
from cStringIO import StringIO
87
86
 
88
87
from bzrlib import (
89
88
    atomicfile,