Skip to content

Commit bfa5607

Browse files
committed
Rename the package to aonvif
1 parent df16c68 commit bfa5607

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+32
-37
lines changed

MANIFEST.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include LICENSE
22
include README.rst
3-
include onvif/wsdl/*
3+
include aonvif/wsdl/*

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ build: bootstrap
2828
$(PYTHON) setup.py sdist bdist_wheel
2929

3030
lint: bootstrap
31-
$(PYTHON) -m flake8 examples onvif tests
31+
$(PYTHON) -m flake8 aonvif examples tests
3232

3333
outdated: bootstrap
3434
$(PYTHON) -m pip list --outdated --format=columns

README.rst

+8-12
File renamed without changes.

onvif/cli.py aonvif/cli.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ def create_parser():
194194
parser.add_argument(
195195
'--cache-location',
196196
dest='cache_location',
197-
default='/tmp/onvif/',
198-
help='location to cache suds objects, default to /tmp/onvif/',
197+
default='/tmp/aonvif/',
198+
help='location to cache suds objects, default to /tmp/aonvif/',
199199
)
200200
parser.add_argument(
201201
'--cache-duration',

onvif/client.py aonvif/client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from . import wsdl
1414

1515

16-
logger = logging.getLogger('onvif')
16+
logger = logging.getLogger('aonvif')
1717
logging.basicConfig(level=logging.INFO)
1818
logging.getLogger('zeep.client').setLevel(logging.CRITICAL)
1919

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

examples/continuous_move.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import asyncio
22
import sys
33

4-
import onvif
4+
import aonvif
55

66

77
IP = '192.168.0.100' # Camera IP address
@@ -84,7 +84,7 @@ async def move_downright(ptz, request):
8484

8585

8686
async def setup_move():
87-
mycam = onvif.ONVIFCamera(IP, PORT, USER, PASS)
87+
mycam = aonvif.ONVIFCamera(IP, PORT, USER, PASS)
8888
await mycam.update_xaddrs()
8989
# Create media service object
9090
media = mycam.create_media_service()

examples/events.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44

55
import pytz
66

7-
import onvif
7+
import aonvif
88

99

1010
logging.getLogger('zeep').setLevel(logging.DEBUG)
1111

1212

1313
async def run():
14-
mycam = onvif.ONVIFCamera(
14+
mycam = aonvif.ONVIFCamera(
1515
'192.168.3.10',
1616
80,
1717
'hass',
1818
'peek4boo',
19-
wsdl_dir='/home/jane/onvif/wsdl',
2019
)
2120
await mycam.update_xaddrs()
2221

examples/streaming.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import asyncio
22

3-
from onvif import ONVIFCamera
3+
import aonvif
44

55

66
async def media_profile_configuration():
@@ -12,7 +12,7 @@ async def media_profile_configuration():
1212
"""
1313

1414
# Create the media service
15-
mycam = ONVIFCamera('192.168.0.112', 80, 'admin', '12345')
15+
mycam = aonvif.ONVIFCamera('192.168.0.112', 80, 'admin', '12345')
1616
await mycam.update_xaddrs()
1717
media_service = mycam.create_media_service()
1818

setup.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ max-line-length = 95
33

44
[tool:pytest]
55
addopts=
6-
--cov=onvif
6+
--cov=aonvif
77
tests
88
filterwarnings =
99
ignore:defusedxml.lxml is no longer supported:DeprecationWarning
@@ -14,7 +14,7 @@ exclude_lines =
1414
if __name__ == '__main__':
1515

1616
[isort]
17-
src_paths=examples,onvif,tests
17+
src_paths=aonvif,examples,tests
1818
line_length=95
1919
multi_line_output=3
2020
force_single_line=True

setup.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ def _get_long_description():
2828
],
2929
zip_safe=False,
3030
project_urls={
31-
'Bug Reports': 'https://github.com/martyanov/onvif/issues',
32-
'Repository': 'https://github.com/martyanov/onvif',
31+
'Bug Reports': 'https://github.com/martyanov/aonvif/issues',
32+
'Repository': 'https://github.com/martyanov/aonvif',
3333
},
3434
packages=setuptools.find_packages(
3535
exclude=[
@@ -41,7 +41,7 @@ def _get_long_description():
4141
'': [
4242
'*.rst',
4343
],
44-
'onvif.wsdl': [
44+
'aonvif.wsdl': [
4545
'*.wsdl',
4646
'*.xsd',
4747
'*xml*',
@@ -77,7 +77,7 @@ def _get_long_description():
7777
},
7878
entry_points={
7979
'console_scripts': [
80-
'onvif-cli=onvif.cli:main',
80+
'aonvif-cli=aonvif.cli:main',
8181
],
8282
},
8383
)

tests/test.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import unittest
44

5-
import onvif
5+
import aonvif
66

77

88
CAM_HOST = '172.20.9.84'
@@ -21,7 +21,7 @@ def log(ret):
2121
class TestDevice(unittest.TestCase):
2222

2323
# Class level cam. Run this test more efficiently..
24-
cam = onvif.ONVIFCamera(CAM_HOST, CAM_PORT, CAM_USER, CAM_PASS)
24+
cam = aonvif.ONVIFCamera(CAM_HOST, CAM_PORT, CAM_USER, CAM_PASS)
2525

2626
# ***************** Test Capabilities ***************************
2727
def test_wsd_url(self):
@@ -51,7 +51,7 @@ def test_get_capabilities(self):
5151
for category in categorys:
5252
self.cam.devicemgmt.GetCapabilities({'Category': category})
5353

54-
with self.assertRaises(onvif.ONVIFError):
54+
with self.assertRaises(aonvif.ONVIFError):
5555
self.cam.devicemgmt.GetCapabilities({'Category': 'unknown'})
5656

5757
def test_get_hostname(self):

tests/test_client.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import pytest
22

3-
import onvif
4-
import onvif.client
3+
import aonvif
4+
import aonvif.client
55

66

77
def test_client_handle_errors():
8-
@onvif.client.handle_errors
8+
@aonvif.client.handle_errors
99
def maybe_raise(r=False):
1010
if r:
1111
raise Exception('oops')
@@ -15,7 +15,7 @@ def maybe_raise(r=False):
1515
assert maybe_raise() == 'ok'
1616

1717
with pytest.raises(
18-
onvif.ONVIFError,
18+
aonvif.ONVIFError,
1919
match='oops',
2020
):
2121
maybe_raise(True)

0 commit comments

Comments
 (0)