move wsdl inside package instead of /etc/onvif/wsdl

Author: mpromonet

onvif/cli.py

@@ -11,6 +11,7 @@
 from suds.sax.text import Text
 from onvif import ONVIFCamera, ONVIFService, ONVIFError
 from definition import SERVICES
+import os.path
 
 SUPPORTED_SERVICES = SERVICES.keys()
 
@@ -129,7 +130,7 @@ def create_parser():
                         help='Username for authentication')
     parser.add_argument('-a', '--password', required=True,
                         help='Password for authentication')
-    parser.add_argument('-w', '--wsdl',  default='/etc/onvif/wsdl/',
+    parser.add_argument('-w', '--wsdl',  default=os.path.join(os.path.dirname(os.path.dirname(__file__)), "wsdl"),
                         help='directory to store ONVIF WSDL documents')
     parser.add_argument('-e', '--encrypt', default='False',
                         help='Encrypt password or not')

onvif/client.py

@@ -204,7 +204,7 @@ class ONVIFCamera(object):
     # Class-level variables
     services_template = {'devicemgmt': None, 'ptz': None, 'media': None,
                          'imaging': None, 'events': None, 'analytics': None }
-    def __init__(self, host, port ,user, passwd, wsdl_dir='/etc/onvif/wsdl/',
+    def __init__(self, host, port ,user, passwd, wsdl_dir=os.path.join(os.path.dirname(os.path.dirname(__file__)), "wsdl"),
                  cache_location=None, cache_duration=None,
                  encrypt=True, daemon=False, no_cache=False):
         self.host = host

setup.py

@@ -44,7 +44,7 @@
       packages=find_packages(exclude=['docs', 'examples', 'tests']),
       install_requires=requires,
       include_package_data=True,
-      data_files=[('/etc/onvif/wsdl', wsdl_files)],
+      data_files=[('wsdl', wsdl_files)],
       entry_points={
           'console_scripts': ['onvif-cli = onvif.cli:main']
           }