summaryrefslogtreecommitdiff
path: root/entities
diff options
context:
space:
mode:
authorroy lewin <roy.lewin@gmail.com>2016-09-22 01:58:05 +0300
committerroy lewin <roy.lewin@gmail.com>2016-09-22 01:58:05 +0300
commit733afb1109a06f89af68e8660728f1b4bbbdab1a (patch)
treeec4c965bea61228c55a7c4c68e1be86446291620 /entities
parent652781137f3856fef98e3063766f9f3b1a984a2e (diff)
parent081eac29a20ab8485f2b8180654a6d4b808e2df7 (diff)
Merge branch 'master' of https://bitbucket.org/lib_2_wiki/parser
# Conflicts: # .idea/misc.xml # .idea/workspace.xml # parsers/INL_xml_parser.py
Diffstat (limited to 'entities')
-rw-r--r--entities/__init__.py6
-rw-r--r--entities/location.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/entities/__init__.py b/entities/__init__.py
index 48f64d6..907ef4d 100644
--- a/entities/__init__.py
+++ b/entities/__init__.py
@@ -1,3 +1,3 @@
-from person import Person
-from institution import Institution
-from location import Location \ No newline at end of file
+from entities.person import Person
+from entities.institution import Institution
+from entities.location import Location \ No newline at end of file
diff --git a/entities/location.py b/entities/location.py
index 8130632..9636c3b 100644
--- a/entities/location.py
+++ b/entities/location.py
@@ -2,7 +2,7 @@ from entities.basic_entity import BasicEntity
class Location(BasicEntity):
- def __init__(self, name, types, coordinates):
+ def __init__(self, name, types, name_in_langs):
self.name = name
self.types = types
- self.coordinates = coordinates
+ self.name_in_langs = name_in_langs