correct documents.py
@@ -113,29 +113,6 @@ class PageDocument(RTDDocTypeMixin, DocType):
def prepare_domains(self, html_file):
"""Prepares and returns the values for domains field."""
-<<<<<<< HEAD
- domains_qs = html_file.sphinx_domains.exclude(
- domain='std',
- type__in=['doc', 'label']
- ).iterator()
-
- all_domains = [
- {
- 'role_name': domain.role_name,
- 'doc_name': domain.doc_name,
- 'anchor': domain.anchor,
- 'type_display': domain.type_display,
- 'doc_display': domain.doc_display,
- 'docstrings': self._get_domain_data(html_file.processed_json['domain_data'],
- 'docstrings', domain.anchor),
- 'signature': self._get_domain_data(html_file.processed_json['domain_data'],
- 'signature', domain.anchor),
- 'name': domain.name,
- 'display_name': domain.display_name if domain.display_name != '-' else '',
- }
- for domain in domains_qs
- ]
-=======
all_domains = []
try:
@@ -174,7 +151,6 @@ class PageDocument(RTDDocTypeMixin, DocType):
html_file.version.slug,
html_file.path,
))
->>>>>>> master
return all_domains
