Skip to content

Commit

Permalink
Python < 3.6 remainder cleanups (home-assistant#25607)
Browse files Browse the repository at this point in the history
  • Loading branch information
scop authored and balloob committed Jul 31, 2019
1 parent 671cb0d commit 3cf8964
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 20 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ addons:
matrix:
fast_finish: true
include:
- python: "3.5.3"
- python: "3.6"
env: TOXENV=lint
- python: "3.5.3"
- python: "3.6"
env: TOXENV=pylint
- python: "3.5.3"
- python: "3.6"
env: TOXENV=typing
- python: "3.5.3"
env: TOXENV=py35
- python: "3.6"
env: TOXENV=py36
- python: "3.7"
env: TOXENV=py37

Expand Down
3 changes: 1 addition & 2 deletions homeassistant/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,7 @@ def main() -> int:

monkey_patch_needed = sys.version_info[:3] < (3, 6, 3)
if monkey_patch_needed and os.environ.get('HASS_NO_MONKEY') != '1':
if sys.version_info[:2] >= (3, 6):
monkey_patch.disable_c_asyncio()
monkey_patch.disable_c_asyncio()
monkey_patch.patch_weakref_tasks()

set_loop()
Expand Down
7 changes: 0 additions & 7 deletions homeassistant/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,6 @@ async def async_from_config_dict(config: Dict[str, Any],
stop = time()
_LOGGER.info("Home Assistant initialized in %.2fs", stop-start)

if sys.version_info[:3] < (3, 6, 0):
hass.components.persistent_notification.async_create(
"Python 3.5 support is deprecated and will "
"be removed in the first release after August 1. Please "
"upgrade Python.", "Python version", "python_version"
)

return hass


Expand Down
8 changes: 4 additions & 4 deletions homeassistant/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import logging
import os
import pathlib
import sys
import threading
from time import monotonic
import uuid
Expand Down Expand Up @@ -142,9 +141,10 @@ def __init__(
self.loop: asyncio.events.AbstractEventLoop = (
loop or asyncio.get_event_loop())

executor_opts = {'max_workers': None} # type: Dict[str, Any]
if sys.version_info[:2] >= (3, 6):
executor_opts['thread_name_prefix'] = 'SyncWorker'
executor_opts = {
'max_workers': None,
'thread_name_prefix': 'SyncWorker',
} # type: Dict[str, Any]

self.executor = ThreadPoolExecutor(**executor_opts)
self.loop.set_default_executor(self.executor)
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ classifier =
Intended Audience :: Developers
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Topic :: Home Automation
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py35, py36, py37, py38, lint, pylint, typing, cov
envlist = py36, py37, py38, lint, pylint, typing, cov
skip_missing_interpreters = True

[testenv]
Expand Down

0 comments on commit 3cf8964

Please sign in to comment.