← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
122
122
    }
123
123
def _escape_replace(match, map=escape_map):
124
124
    return map[match.group()]
125
 
 
 
125
 
126
126
def _escape_attrib(text, encoding=None, replace=None):
127
127
    # escape attribute value
128
128
    try:
153
153
    }
154
154
def _escape_cdata_replace(match, map=escape_cdata_map):
155
155
    return map[match.group()]
156
 
 
 
156
 
157
157
def _escape_cdata(text, encoding=None, replace=None):
158
158
    # escape character data
159
159
    try: