Merge branch 'RobbieClarken-novalue-snak'

Author: siznax

tests/test_basic.py

@@ -29,6 +29,7 @@
 from . import siteviews
 from . import wikidata
 from . import wikidata_deleted
+from . import wikidata_novalue_snak
 
 SILENT_FLAG = True
 SKIP_FLAG = ['imageinfo', 'labels']
@@ -998,6 +999,12 @@ def test_wikidata_deleted(self):
 
         self.assertTrue('requests' not in page.data)
 
+    def test_wikidata_no_value_snak(self):
+        page = wptools.wikidata(skip=SKIP_FLAG, silent=SILENT_FLAG)
+        page.cache = {'wikidata': wikidata_novalue_snak.cache}
+        page._set_data('wikidata')
+        self.assertEqual(len(page.data['claims']), 2)
+
 
 class WPToolsToolTestCase(unittest.TestCase):
 

tests/wikidata_novalue_snak.py

@@ -0,0 +1,65 @@
+# -*- coding:utf-8 -*-
+
+query = 'https://www.wikidata.org/w/api.php?action=wbgetentities&format=json&formatversion=2&ids=Q483718&languages=en&props=info|claims|descriptions|labels|sitelinks&redirects=yes&sites=&titles='
+
+response = r"""{
+    "entities": {
+        "Q483718": {
+            "pageid": 455294,
+            "ns": 0,
+            "title": "Q483718",
+            "lastrevid": 610328494,
+            "modified": "2017-12-17T18:21:13Z",
+            "type": "item",
+            "id": "Q483718",
+            "labels": {
+                "en": {
+                    "language": "en",
+                    "value": "Foo Fighters"
+                }
+            },
+            "descriptions": {
+                "en": {
+                    "language": "en",
+                    "value": "American rock band, formed in Seattle in 1994"
+                }
+            },
+            "claims": {
+                "P576": [
+                    {
+                        "mainsnak": {
+                            "snaktype": "novalue",
+                            "property": "P576",
+                            "hash": "6a18d40010201ff9031e85a3fe98f1f0dc1d7cc4",
+                            "datatype": "time"
+                        },
+                        "type": "statement",
+                        "id": "Q483718$9da5583a-45e8-4268-2770-41d999bd53da",
+                        "rank": "normal"
+                    }
+                ],
+                "P373": [
+                    {
+                        "mainsnak": {
+                            "snaktype": "value",
+                            "property": "P373",
+                            "hash": "4d08e8ef6597a712d926b71c1c3b52d51d99a1a9",
+                            "datavalue": {
+                                "value": "Foo Fighters",
+                                "type": "string"
+                            },
+                            "datatype": "string"
+                        },
+                        "type": "statement",
+                        "id": "q483718$6CA37AA3-178A-41CF-B219-46F9BA68CC03",
+                        "rank": "normal"
+                    }
+                ]
+            },
+            "sitelinks": {}
+        }
+    },
+    "success": 1
+}"""
+
+cache = {'query': query, 'response': response}

wptools/wikidata.py

@@ -355,26 +355,30 @@ def reduce_claims(query_claims):
     """
     claims = collections.defaultdict(list)
 
-    for claim in query_claims:
+    for claim, entities in query_claims.items():
 
-        for ent in query_claims.get(claim):
+        for ent in entities:
 
             try:
-                snak = ent.get('mainsnak').get('datavalue').get('value')
+                snak = ent.get('mainsnak')
+                snaktype = snak.get('snaktype')
+                value = snak.get('datavalue').get('value')
             except AttributeError:
                 claims[claim] = []
 
             try:
-                if snak.get('id'):
-                    val = snak.get('id')
-                elif snak.get('text'):
-                    val = snak.get('text')
-                elif snak.get('time'):
-                    val = snak.get('time')
+                if snaktype != 'value':
+                    val = snaktype
+                elif value.get('id'):
+                    val = value.get('id')
+                elif value.get('text'):
+                    val = value.get('text')
+                elif value.get('time'):
+                    val = value.get('time')
                 else:
-                    val = snak
+                    val = value
             except AttributeError:
-                val = snak
+                val = value
 
             if not val or not [x for x in val if x]:
                 raise ValueError("%s %s" % (claim, ent))