diff options
| author | roy lewin <roy.lewin@gmail.com> | 2016-09-22 09:46:24 +0300 |
|---|---|---|
| committer | roy lewin <roy.lewin@gmail.com> | 2016-09-22 09:46:24 +0300 |
| commit | 403fb8666125e74617e89aae7e87823cb78d5485 (patch) | |
| tree | eec23fd511784c9bc74868df02cd2abde85189b1 | |
| parent | 457a954eef562015eb5b3b33f4b1612d576d890d (diff) | |
| parent | 6c27628aa7752fa10efc76adcc18cb69d700cdfe (diff) | |
Merge branch 'master' of https://bitbucket.org/lib_2_wiki/parser
# Conflicts:
# .idea/workspace.xml
| -rw-r--r-- | .idea/workspace.xml | 32 | ||||
| -rw-r--r-- | parsers/INL_xml_parser.py | 4 |
2 files changed, 12 insertions, 24 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index af29279..5299b52 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,6 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="b3a73108-18f8-44f3-8073-d1952fb9639d" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.gitignore" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/lib2wiki.iml" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/entities/__init__.py" afterPath="$PROJECT_DIR$/entities/__init__.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/entities/location.py" afterPath="$PROJECT_DIR$/entities/location.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/factories/INL_factory.py" afterPath="$PROJECT_DIR$/factories/INL_factory.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/factories/__init__.py" afterPath="$PROJECT_DIR$/factories/__init__.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/libs/__init__.py" afterPath="$PROJECT_DIR$/libs/__init__.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/parsers/INL_xml_parser.py" afterPath="$PROJECT_DIR$/parsers/INL_xml_parser.py" /> </list> <ignored path="lib2wiki.iws" /> @@ -30,18 +21,7 @@ <favorites_list name="lib2wiki" /> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/.gitignore"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" /> </component> <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> @@ -83,7 +63,6 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scratches" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -174,6 +153,7 @@ </PATH> </subPane> </pane> + <pane id="Scratches" /> <pane id="Scope" /> </panes> </component> @@ -453,5 +433,13 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/.gitignore"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> </component> </project>
\ No newline at end of file diff --git a/parsers/INL_xml_parser.py b/parsers/INL_xml_parser.py index 2ba96c9..c23cf20 100644 --- a/parsers/INL_xml_parser.py +++ b/parsers/INL_xml_parser.py @@ -54,5 +54,5 @@ class INLXmlParser: newTag.text = data.text >>>>>>> 081eac29a20ab8485f2b8180654a6d4b808e2df7 - newRecordTree = ET.ElementTree(newRecord) - return newRecordTree + # newRecordTree = ET.ElementTree(newRecord) + return newRecord |