Skip to content

Commit 5165fed

Browse files
committed
Drop support for EOL Python 2
1 parent c0200e0 commit 5165fed

File tree

4 files changed

+5
-19
lines changed

4 files changed

+5
-19
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ clean-pyc:
1515
find . -name '*~' -exec rm -f {} +
1616

1717
install:
18-
python setup.py install
18+
python3 setup.py install
1919

2020
docs:
2121
$(MAKE) -C docs html

livereload/server.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@
2626
from .handlers import LiveReloadHandler, LiveReloadJSHandler
2727
from .handlers import ForceReloadHandler, StaticFileHandler
2828
from .watcher import get_watcher_class
29-
from six import string_types, PY3
3029

3130
import sys
3231

33-
if sys.version_info >= (3, 7) or sys.version_info.major == 2:
32+
if sys.version_info >= (3, 7):
3433
import errno
3534
else:
3635
from os import errno

livereload/watcher.py

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@
1212
import logging
1313
import os
1414
import time
15-
import sys
16-
17-
if sys.version_info.major < 3:
18-
import inspect
19-
else:
20-
from inspect import signature
15+
from inspect import signature
2116

2217
try:
2318
import pyinotify
@@ -108,11 +103,7 @@ def examine(self):
108103
name = getattr(func, '__name__', 'anonymous')
109104
logger.info(
110105
f"Running task: {name} (delay: {delay})")
111-
if sys.version_info.major < 3:
112-
sig_len = len(inspect.getargspec(func)[0])
113-
else:
114-
sig_len = len(signature(func).parameters)
115-
if sig_len > 0 and isinstance(changed, list):
106+
if len(signature(func).parameters) > 0 and isinstance(changed, list):
116107
func(changed)
117108
else:
118109
func()
@@ -205,10 +196,7 @@ def is_folder_changed(self, path, ignore=None):
205196

206197
def get_changed_glob_files(self, path, ignore=None):
207198
"""Check if glob path has any changed filepaths."""
208-
if sys.version_info[0] >=3 and sys.version_info[1] >=5:
209-
files = glob.glob(path, recursive=True)
210-
else:
211-
files = glob.glob(path)
199+
files = glob.glob(path, recursive=True)
212200
changed_files = [f for f in files if self.is_file_changed(f, ignore)]
213201
return changed_files
214202

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ def version():
3333
},
3434
install_requires=[
3535
'tornado',
36-
'six',
3736
],
3837
license='BSD',
3938
include_package_data=True,

0 commit comments

Comments
 (0)