History - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

Pushed to one repository ·

View In Graph Contained in 0.6, 0.7, and 0.7.1

the sets module is deprecated in Python 2.6

[SF bug# 2421939]

Changeset e29c65bdc55b …

Parent c6903eee7297 …

by TK Soh Dec 13 08 at 2:55 AM

Changes to one file · Browse files at e29c65bdc55b Showing diff from parent c6903eee7297 Diff from another changeset...

Change 1 of 3 Show Changes Only Show Entire File Loading... hggtk/iniparse/ini.py Stacked
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567	`# Copyright (c) 2001, 2002, 2003 Python Software Foundation` `# Copyright (c) 2004 Paramjit Oberoi <param.cs.wisc.edu>` `# All Rights Reserved. See LICENSE-PSF & LICENSE for details.` `"""Access and/or modify INI files` `* Compatiable with ConfigParser` `* Preserves order of sections & options` `* Preserves comments/blank lines/etc` `* More conveninet access to data` `Example:` `>>> from StringIO import StringIO` `>>> sio = StringIO('''# configure foo-application` `... [foo]` `... bar1 = qualia` `... bar2 = 1977` `... [foo-ext]` `... special = 1''')` `>>> cfg = INIConfig(sio)` `>>> print cfg.foo.bar1` `qualia` `>>> print cfg['foo-ext'].special` `1` `>>> cfg.foo.newopt = 'hi!'` `>>> print cfg` `# configure foo-application` `[foo]` `bar1 = qualia` `bar2 = 1977` `newopt = hi!` `[foo-ext]` `special = 1` `"""` `# An ini parser that supports ordered sections/options` `# Also supports updates, while preserving structure` `# Backward-compatiable with ConfigParser` `import re` `import config`-`from sets import Set` `from ConfigParser import DEFAULTSECT, ParsingError, MissingSectionHeaderError` `class LineType(object):` `line = None` `def __init__(self, line=None):` `if line is not None:` `self.line = line.strip('\n')` `# Return the original line for unmodified objects` `# Otherwise construct using the current attribute values` `def __str__(self):` `if self.line is not None:` `return self.line` `else:` `return self.to_string()` `# If an attribute is modified after initialization` `# set line to None since it is no longer accurate.` `def __setattr__(self, name, value):` `if hasattr(self,name):` `self.__dict__['line'] = None` `self.__dict__[name] = value` `def to_string(self):` `raise Exception('This method must be overridden in derived classes')` `class SectionLine(LineType):` `regex = re.compile(r'^\['` `r'(?P<name>[^]]+)'` `r'\]\s'` `r'((?P<csep>;\|#)(?P<comment>.))?$')` `def __init__(self, name, comment=None, comment_separator=None,` `comment_offset=-1, line=None):` `super(SectionLine, self).__init__(line)` `self.name = name` `self.comment = comment` `self.comment_separator = comment_separator` `self.comment_offset = comment_offset` `def to_string(self):` `out = '[' + self.name + ']'` `if self.comment is not None:` `# try to preserve indentation of comments` `out = (out+' ').ljust(self.comment_offset)` `out = out + self.comment_separator + self.comment` `return out` `def parse(cls, line):` `m = cls.regex.match(line.rstrip())` `if m is None:` `return None` `return cls(m.group('name'), m.group('comment'),` `m.group('csep'), m.start('csep'),` `line)` `parse = classmethod(parse)` `class OptionLine(LineType):` `def __init__(self, name, value, separator=' = ', comment=None,` `comment_separator=None, comment_offset=-1, line=None):` `super(OptionLine, self).__init__(line)` `self.name = name` `self.value = value` `self.separator = separator` `self.comment = comment` `self.comment_separator = comment_separator` `self.comment_offset = comment_offset` `def to_string(self):` `out = '%s%s%s' % (self.name, self.separator, self.value)` `if self.comment is not None:` `# try to preserve indentation of comments` `out = (out+' ').ljust(self.comment_offset)` `out = out + self.comment_separator + self.comment` `return out` `regex = re.compile(r'^(?P<name>[^:=\s[][^:=])'` `r'(?P<sep>[:=]\s)'` `r'(?P<value>.)$')` `def parse(cls, line):` `m = cls.regex.match(line.rstrip())` `if m is None:` `return None` `name = m.group('name').rstrip()` `value = m.group('value')` `sep = m.group('name')[len(name):] + m.group('sep')` `# comments are not detected in the regex because` `# ensuring total compatibility with ConfigParser` `# requires that:` `# option = value ;comment // value=='value'` `# option = value;1 ;comment // value=='value;1 ;comment'` `#` `# Doing this in a regex would be complicated. I` `# think this is a bug. The whole issue of how to` `# include ';' in the value needs to be addressed.` `# Also, '#' doesn't mark comments in options...` `coff = value.find(';')` `if coff != -1 and value[coff-1].isspace():` `comment = value[coff+1:]` `csep = value[coff]` `value = value[:coff].rstrip()` `coff = m.start('value') + coff` `else:` `comment = None` `csep = None` `coff = -1` `return cls(name, value, sep, comment, csep, coff, line)` `parse = classmethod(parse)` `class CommentLine(LineType):` `regex = re.compile(r'^(?P<csep>[;#]\|[rR][eE][mM])'` `r'(?P<comment>.)$')` `def __init__(self, comment='', separator='#', line=None):` `super(CommentLine, self).__init__(line)` `self.comment = comment` `self.separator = separator` `def to_string(self):` `return self.separator + self.comment` `def parse(cls, line):` `m = cls.regex.match(line.rstrip())` `if m is None:` `return None` `return cls(m.group('comment'), m.group('csep'), line)` `parse = classmethod(parse)` `class EmptyLine(LineType):` `# could make this a singleton` `def to_string(self):` `return ''` `def parse(cls, line):` `if line.strip(): return None` `return cls(line)` `parse = classmethod(parse)` `class ContinuationLine(LineType):` `regex = re.compile(r'^\s+(?P<value>.)$')` `def __init__(self, value, value_offset=8, line=None):` `super(ContinuationLine, self).__init__(line)` `self.value = value` `self.value_offset = value_offset` `def to_string(self):` `return ' 'self.value_offset + self.value` `def parse(cls, line):` `m = cls.regex.match(line.rstrip())` `if m is None:` `return None` `return cls(m.group('value'), m.start('value'), line)` `parse = classmethod(parse)` `class LineContainer(object):` `def __init__(self, d=None):` `self.contents = []` `self.orgvalue = None` `if d:` `if isinstance(d, list): self.extend(d)` `else: self.add(d)` `def add(self, x):` `self.contents.append(x)` `def extend(self, x):` `for i in x: self.add(i)` `def get_name(self):` `return self.contents[0].name` `def set_name(self, data):` `self.contents[0].name = data` `def get_value(self):` `if self.orgvalue is not None:` `return self.orgvalue` `elif len(self.contents) == 1:` `return self.contents[0].value` `else:` `return '\n'.join([str(x.value) for x in self.contents` `if not isinstance(x, (CommentLine, EmptyLine))])` `def set_value(self, data):` `self.orgvalue = data` `lines = str(data).split('\n')` `linediff = len(lines) - len(self.contents)` `if linediff > 0:` `for _ in range(linediff):` `self.add(ContinuationLine(''))` `elif linediff < 0:` `self.contents = self.contents[:linediff]` `for i,v in enumerate(lines):` `self.contents[i].value = v` `name = property(get_name, set_name)` `value = property(get_value, set_value)` `def __str__(self):` `s = [str(x) for x in self.contents]` `return '\n'.join(s)` `def finditer(self, key):` `for x in self.contents[::-1]:` `if hasattr(x, 'name') and x.name==key:` `yield x` `def find(self, key):` `for x in self.finditer(key):` `return x` `raise KeyError(key)` `def _make_xform_property(myattrname, srcattrname=None):` `private_attrname = myattrname + 'value'` `private_srcname = myattrname + 'source'` `if srcattrname is None:` `srcattrname = myattrname` `def getfn(self):` `srcobj = getattr(self, private_srcname)` `if srcobj is not None:` `return getattr(srcobj, srcattrname)` `else:` `return getattr(self, private_attrname)` `def setfn(self, value):` `srcobj = getattr(self, private_srcname)` `if srcobj is not None:` `setattr(srcobj, srcattrname, value)` `else:` `setattr(self, private_attrname, value)` `return property(getfn, setfn)` `class INISection(config.ConfigNamespace):` `_lines = None` `_options = None` `_defaults = None` `_optionxformvalue = None` `_optionxformsource = None` `def __init__(self, lineobj, defaults = None,` `optionxformvalue=None, optionxformsource=None):` `self._lines = [lineobj]` `self._defaults = defaults` `self._optionxformvalue = optionxformvalue` `self._optionxformsource = optionxformsource` `self._options = {}` `_optionxform = _make_xform_property('_optionxform')` `def __getitem__(self, key):` `if key == '__name__':` `return self._lines[-1].name` `if self._optionxform: key = self._optionxform(key)` `try:` `return self._options[key].value` `except KeyError:` `if self._defaults and key in self._defaults._options:` `return self._defaults._options[key].value` `else:` `raise` `def __setitem__(self, key, value):` `if self._optionxform: xkey = self._optionxform(key)` `else: xkey = key` `if xkey not in self._options:` `# create a dummy object - value may have multiple lines` `obj = LineContainer(OptionLine(key, ''))` `self._lines[-1].add(obj)` `self._options[xkey] = obj` `# the set_value() function in LineContainer` `# automatically handles multi-line values` `self._options[xkey].value = value` `def __delitem__(self, key):` `if self._optionxform: key = self._optionxform(key)` `for l in self._lines:` `remaining = []` `for o in l.contents:` `if isinstance(o, LineContainer):` `n = o.name` `if self._optionxform: n = self._optionxform(n)` `if key != n: remaining.append(o)` `else:` `remaining.append(o)` `l.contents = remaining` `del self._options[key]` `def __iter__(self):`-`d = Set()`+`d = set()` `for l in self._lines:` `for x in l.contents:` `if isinstance(x, LineContainer):` `if self._optionxform:` `ans = self._optionxform(x.name)` `else:` `ans = x.name` `if ans not in d:` `yield ans` `d.add(ans)` `if self._defaults:` `for x in self._defaults:` `if x not in d:` `yield x` `d.add(x)` `def new_namespace(self, name):` `raise Exception('No sub-sections allowed', name)` `def make_comment(line):` `return CommentLine(line.rstrip())` `def readline_iterator(f):` `"""iterate over a file by only using the file object's readline method"""` `have_newline = False` `while True:` `line = f.readline()` `if not line:` `if have_newline:` `yield ""` `return` `if line.endswith('\n'):` `have_newline = True` `else:` `have_newline = False` `yield line` `class INIConfig(config.ConfigNamespace):` `_data = None` `_sections = None` `_defaults = None` `_optionxformvalue = None` `_optionxformsource = None` `_sectionxformvalue = None` `_sectionxformsource = None` `_parse_exc = None` `def __init__(self, fp=None, defaults = None, parse_exc=True,` `optionxformvalue=str.lower, optionxformsource=None,` `sectionxformvalue=None, sectionxformsource=None):` `self._data = LineContainer()` `self._parse_exc = parse_exc` `self._optionxformvalue = optionxformvalue` `self._optionxformsource = optionxformsource` `self._sectionxformvalue = sectionxformvalue` `self._sectionxformsource = sectionxformsource` `self._sections = {}` `if defaults is None: defaults = {}` `self._defaults = INISection(LineContainer(), optionxformsource=self)` `for name, value in defaults.iteritems():` `self._defaults[name] = value` `if fp is not None:` `self.readfp(fp)` `_optionxform = _make_xform_property('_optionxform', 'optionxform')` `_sectionxform = _make_xform_property('_sectionxform', 'optionxform')` `def __getitem__(self, key):` `if key == DEFAULTSECT:` `return self._defaults` `if self._sectionxform: key = self._sectionxform(key)` `return self._sections[key]` `def __setitem__(self, key, value):` `raise Exception('Values must be inside sections', key, value)` `def __delitem__(self, key):` `if self._sectionxform: key = self._sectionxform(key)` `for line in self._sections[key]._lines:` `self._data.contents.remove(line)` `del self._sections[key]` `def __iter__(self):`-`d = Set()`+`d = set()` `for x in self._data.contents:` `if isinstance(x, LineContainer):` `if x.name not in d:` `yield x.name` `d.add(x.name)` `def new_namespace(self, name):` `if self._data.contents:` `self._data.add(EmptyLine())` `obj = LineContainer(SectionLine(name))` `self._data.add(obj)` `if self._sectionxform: name = self._sectionxform(name)` `if name in self._sections:` `ns = self._sections[name]` `ns._lines.append(obj)` `else:` `ns = INISection(obj, defaults=self._defaults,` `optionxformsource=self)` `self._sections[name] = ns` `return ns` `def __str__(self):` `return str(self._data)` `_line_types = [EmptyLine, CommentLine,` `SectionLine, OptionLine,` `ContinuationLine]` `def _parse(self, line):` `for linetype in self._line_types:` `lineobj = linetype.parse(line)` `if lineobj:` `return lineobj` `else:` `# can't parse line` `return None` `def readfp(self, fp):` `cur_section = None` `cur_option = None` `cur_section_name = None` `cur_option_name = None` `pending_lines = []` `try:` `fname = fp.name` `except AttributeError:` `fname = '<???>'` `linecount = 0` `exc = None` `line = None` `for line in readline_iterator(fp):` `lineobj = self._parse(line)` `linecount += 1` `if not cur_section and not isinstance(lineobj,` `(CommentLine, EmptyLine, SectionLine)):` `if self._parse_exc:` `raise MissingSectionHeaderError(fname, linecount, line)` `else:` `lineobj = make_comment(line)` `if lineobj is None:` `if self._parse_exc:` `if exc is None: exc = ParsingError(fname)` `exc.append(linecount, line)` `lineobj = make_comment(line)` `if isinstance(lineobj, ContinuationLine):` `if cur_option:` `cur_option.extend(pending_lines)` `pending_lines = []` `cur_option.add(lineobj)` `else:` `# illegal continuation line - convert to comment` `if self._parse_exc:` `if exc is None: exc = ParsingError(fname)` `exc.append(linecount, line)` `lineobj = make_comment(line)` `if isinstance(lineobj, OptionLine):` `cur_section.extend(pending_lines)` `pending_lines = []` `cur_option = LineContainer(lineobj)` `cur_section.add(cur_option)` `if self._optionxform:` `cur_option_name = self._optionxform(cur_option.name)` `else:` `cur_option_name = cur_option.name` `if cur_section_name == DEFAULTSECT:` `optobj = self._defaults` `else:` `optobj = self._sections[cur_section_name]` `optobj._options[cur_option_name] = cur_option` `if isinstance(lineobj, SectionLine):` `self._data.extend(pending_lines)` `pending_lines = []` `cur_section = LineContainer(lineobj)` `self._data.add(cur_section)` `cur_option = None` `cur_option_name = None` `if cur_section.name == DEFAULTSECT:` `self._defaults._lines.append(cur_section)` `cur_section_name = DEFAULTSECT` `else:` `if self._sectionxform:` `cur_section_name = self._sectionxform(cur_section.name)` `else:` `cur_section_name = cur_section.name` `if not self._sections.has_key(cur_section_name):` `self._sections[cur_section_name] = \` `INISection(cur_section, defaults=self._defaults,` `optionxformsource=self)` `else:` `self._sections[cur_section_name]._lines.append(cur_section)` `if isinstance(lineobj, (CommentLine, EmptyLine)):` `pending_lines.append(lineobj)` `self._data.extend(pending_lines)` `if line and line[-1]=='\n':` `self._data.add(EmptyLine())` `if exc:` `raise exc`

Diff Options

the sets module is deprecated in Python 2.6

[SF bug# 2421939]

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

the sets module is deprecated in Python 2.6 [SF bug# 2421939]

Diff to e29c65bdc55b

Attach a Trello Card

Add a tag

Your session has expired

the sets module is deprecated in Python 2.6

[SF bug# 2421939]