suricatactl: Make code compatible with Python 3

Call to suricatactl was failing with Python3 with the following error:
```
Traceback (most recent call last):
  File "bin/suricatactl", line 40, in <module>
    sys.exit(main())
  File "./suricata/ctl/main.py", line 50, in main
    args.func(args)
AttributeError: 'Namespace' object has no attribute 'func'
```
Fix this by making it run with Py3 just like it does with Py2.

Closes redmine ticket #2793

diff --git a/python/suricata/ctl/filestore.py b/python/suricata/ctl/filestore.py
index f9f804d34378f435126fc19850aa7c6debf2fc72..c0f101b36eb45690a0515e8b86bea9aacc8a15a6 100644 (file)
--- a/python/suricata/ctl/filestore.py
+++ b/python/suricata/ctl/filestore.py
@@ -30,7 +30,6 @@ class InvalidAgeFormatError(Exception):
     pass
 
 def register_args(parser):
-
     parsers = parser.add_subparsers()
 
     prune_parser = parsers.add_parser("prune")

diff --git a/python/suricata/ctl/main.py b/python/suricata/ctl/main.py
index 6a742adaf4d73b21743e9c4290adae711f661fad..1d09b900e5b5576361097df98aecbbff21c5ea3a 100644 (file)
--- a/python/suricata/ctl/main.py
+++ b/python/suricata/ctl/main.py
@@ -46,5 +46,8 @@ def main():
     filestore.register_args(subparsers.add_parser("filestore"))
 
     args = parser.parse_args()
-
-    args.func(args)
+    try:
+        func = args.func
+    except AttributeError:
+        parser.error("too few arguments")
+    func(args)

diff --git a/python/suricata/ctl/test_filestore.py b/python/suricata/ctl/test_filestore.py
index 26b107fd23e87c597f676bc069f5e3b5b448d1e3..0cb0dd08a956ea561e9ee89d0629b4fefcad5adc 100644 (file)
--- a/python/suricata/ctl/test_filestore.py
+++ b/python/suricata/ctl/test_filestore.py
@@ -2,7 +2,7 @@ from __future__ import print_function
 
 import unittest
 
-import filestore
+from suricata.ctl import filestore
 
 class PruneTestCase(unittest.TestCase):