diff options
| -rw-r--r-- | pywal/colors.py | 10 | ||||
| -rw-r--r-- | pywal/sequences.py | 2 | ||||
| -rw-r--r-- | setup.py | 14 |
3 files changed, 10 insertions, 16 deletions
diff --git a/pywal/colors.py b/pywal/colors.py index 9984b6e..4ed4b4b 100644 --- a/pywal/colors.py +++ b/pywal/colors.py @@ -18,12 +18,12 @@ def imagemagick(color_count, img): else: magick_command = ["convert"] - colors = subprocess.Popen([*magick_command, img, "-resize", "25%", - "+dither", "-colors", str(color_count), - "-unique-colors", "txt:-"], - stdout=subprocess.PIPE) + colors = subprocess.run([*magick_command, img, "-resize", "25%", + "+dither", "-colors", str(color_count), + "-unique-colors", "txt:-"], + stdout=subprocess.PIPE) - return colors.stdout.readlines() + return colors.stdout.splitlines() def gen_colors(img, color_count): diff --git a/pywal/sequences.py b/pywal/sequences.py index 0d6e0e6..7b6f4ae 100644 --- a/pywal/sequences.py +++ b/pywal/sequences.py @@ -55,7 +55,7 @@ def create_sequences(colors, vte): # 13 = mouse foreground sequences.append(set_special(10, colors["special"]["foreground"], "g")) sequences.append(set_special(11, colors["special"]["background"], "h")) - sequences.append(set_special(12, colors["special"]["cursor"], "l")) + sequences.append(set_special(12, colors["colors"]["color1"], "l")) sequences.append(set_special(13, colors["special"]["cursor"], "l")) if OS == "Darwin": @@ -3,22 +3,19 @@ import setuptools try: import pywal -except (ImportError, SyntaxError): +except ImportError: print("error: pywal requires Python 3.5 or greater.") quit(1) - try: import pypandoc LONG_DESC = pypandoc.convert("README.md", "rst") -except(IOError, ImportError, RuntimeError): +except (IOError, ImportError, RuntimeError): LONG_DESC = open('README.md').read() - VERSION = pywal.__version__ DOWNLOAD = "https://github.com/dylanaraps/pywal/archive/%s.tar.gz" % VERSION - setuptools.setup( name="pywal", version=VERSION, @@ -37,10 +34,7 @@ setuptools.setup( "Programming Language :: Python :: 3.6", ], packages=["pywal"], - entry_points={ - "console_scripts": ["wal=pywal.__main__:main"] - }, + entry_points={"console_scripts": ["wal=pywal.__main__:main"]}, python_requires=">=3.5", test_suite="tests", - include_package_data=True -) + include_package_data=True) |