Ignore:
Timestamp:
Mar 19, 2014, 11:31:01 PM (11 years ago)
Author:
dmik
Message:

python: Merge vendor 2.7.6 to trunk.

Location:
python/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • python/trunk

  • python/trunk/Lib/plistlib.py

    r2 r391  
    225225PLISTHEADER = """\
    226226<?xml version="1.0" encoding="UTF-8"?>
    227 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
     227<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
    228228"""
    229229
     
    263263        self.beginElement("data")
    264264        self.indentLevel -= 1
    265         maxlinelength = 76 - len(self.indent.replace("\t", " " * 8) *
    266                                  self.indentLevel)
     265        maxlinelength = max(16, 76 - len(self.indent.replace("\t", " " * 8) *
     266                                 self.indentLevel))
    267267        for line in data.asBase64(maxlinelength).split("\n"):
    268268            if line:
Note: See TracChangeset for help on using the changeset viewer.