Merge pull request #925 from p-l-/pre-release

Pre-release fixes

MANIFEST

@@ -82,6 +82,7 @@ ivre/view.py
 ivre/xmlnmap.py
 ivre/zgrabout.py
 ivre/analyzer/__init__.py
+ivre/analyzer/dicom.py
 ivre/analyzer/ike.py
 ivre/db/__init__.py
 ivre/db/elastic.py

ivre/db/__init__.py

@@ -1926,10 +1926,10 @@ def store_scan_json_zdns(self, fname, filehash=None,
                     {'name': name, 'type': 'PTR',
                      'domains': list(utils.get_domains(name))}
                     for name in (
-                            ans['answer'].rstrip('.')
-                            for ans in answers
-                            if (ans.get('class') == 'IN' and
-                                ans.get('type') == 'PTR')
+                        ans['answer'].rstrip('.')
+                        for ans in answers
+                        if (ans.get('class') == 'IN' and
+                            ans.get('type') == 'PTR')
                     )
                 ]
                 if not hostnames:

ivre/keys.py

@@ -291,7 +291,8 @@ def getkeys(self, host):
             key = script["script"][self.scriptid]['pubkey']
             yield Key(host['addr'], script["port"], "ssl", key['type'],
                       key['bits'],
-                      _rsa_construct(long(key['exponent']), long(key['modulus'])),
+                      _rsa_construct(long(key['exponent']),
+                                     long(key['modulus'])),
                       utils.decode_hex(script["script"][self.scriptid]['md5']))
 
 

web/static/doc/dev/web-api.html

@@ -217,7 +217,7 @@ <h1>Web API<a class="headerlink" href="#web-api" title="Permalink to this headli
 strings</p></li>
 <li><p><strong>datesasstrings</strong> (<em>bool</em>) – to get dates as strings rather than as
 timestamps</p></li>
-<li><p><strong>format</strong> (<em>str</em>) – “json” (the default) or “txt”</p></li>
+<li><p><strong>format</strong> (<em>str</em>) – “json” (the default), “ndjson” or “txt”</p></li>
 </ul>
 </dd>
 <dt class="field-odd">Status Codes</dt>
@@ -283,6 +283,7 @@ <h1>Web API<a class="headerlink" href="#web-api" title="Permalink to this headli
 strings</p></li>
 <li><p><strong>datesasstrings</strong> (<em>bool</em>) – to get dates as strings rather than as
 timestamps</p></li>
+<li><p><strong>format</strong> (<em>str</em>) – “json” (the default) or “ndjson”</p></li>
 </ul>
 </dd>
 <dt class="field-odd">Status Codes</dt>
@@ -318,6 +319,7 @@ <h1>Web API<a class="headerlink" href="#web-api" title="Permalink to this headli
 strings</p></li>
 <li><p><strong>datesasstrings</strong> (<em>bool</em>) – to get dates as strings rather than as
 timestamps</p></li>
+<li><p><strong>format</strong> (<em>str</em>) – “json” (the default) or “ndjson”</p></li>
 </ul>
 </dd>
 <dt class="field-odd">Status Codes</dt>