Revision 892
Added by Aaron Marcuse-Kubitza almost 13 years ago
xpath.py | ||
---|---|---|
3 | 3 |
import copy |
4 | 4 |
|
5 | 5 |
from Parser import Parser |
6 |
import util |
|
6 | 7 |
import xml_dom |
7 | 8 |
|
8 | 9 |
class XpathElem: |
... | ... | |
149 | 150 |
into separate nodes''' |
150 | 151 |
if last_only == None: last_only = create |
151 | 152 |
if limit == None or limit > 1: last_only = False |
152 |
if type(xpath) == str: xpath = parse(xpath)
|
|
153 |
if util.is_str(xpath): xpath = parse(xpath)
|
|
153 | 154 |
|
154 | 155 |
if xpath == []: return [parent] |
155 | 156 |
if create and not is_positive(xpath): return [] |
... | ... | |
234 | 235 |
return next |
235 | 236 |
|
236 | 237 |
def put_obj(root, xpath, id_, has_types, value=None): |
237 |
if type(xpath) == str: xpath = parse(xpath)
|
|
238 |
if util.is_str(xpath): xpath = parse(xpath)
|
|
238 | 239 |
|
239 | 240 |
xpath = copy.deepcopy(xpath) # don't modify input! |
240 | 241 |
set_id(xpath, id_, has_types) |
Also available in: Unified diff
Replaced all type(...) == str with util.is_str(...) to properly treat Unicode objects as strings