Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion obswebsocket/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@

__all__ = ["obsws", "events", "requests"]

VERSION = "1.0"
VERSION = "1.1beta1"
2 changes: 1 addition & 1 deletion obswebsocket/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def connect(self):
self.ws = websocket.WebSocket()
url = "ws://{}:{}".format(self.host, self.port)
LOG.info("Connecting to %s..." % (url))
self.ws.connect(url)
self.ws.connect(url, timeout=self.timeout)
LOG.info("Connected!")
if self.legacy:
self._auth_legacy()
Expand Down
13 changes: 11 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
#!/usr/bin/env python3

import os, re
from distutils.core import setup
from obswebsocket import VERSION

def read_version():
version_file = os.path.join(os.path.dirname(__file__), "obswebsocket", "__init__.py")
with open(version_file, "r") as f:
content = f.read()
match = re.search(r'^VERSION\s*=\s*["\']([^"\']+)["\']', content, re.MULTILINE)
if match:
return match.group(1)

VERSION=read_version()

# Convert README from Markdown to reStructuredText
description = "Please take a look at README.md"
Expand Down