Merge pull request #43 from kennydo/kedo-update-pipes

Import `quote` from `shlex` instead of `pipes`

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
  - id: debug-statements
  - id: end-of-file-fixer
  - id: trailing-whitespace
-- repo: https://gitlab.com/pycqa/flake8
+- repo: https://github.com/pycqa/flake8
  rev: 3.7.1
  hooks:
  - id: flake8

aactivator.py

@@ -32,7 +32,7 @@
 import stat
 import sys
 from os.path import relpath
-from pipes import quote
+from shlex import quote
 
 
 ENVIRONMENT_VARIABLE = 'AACTIVATOR_ACTIVE'

setup.py

@@ -14,12 +14,12 @@
  platforms='linux',
  classifiers=[
  'License :: OSI Approved :: MIT License',
- 'Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 2.7',
  'Programming Language :: Python :: 3',
  'Programming Language :: Python :: 3.4',
  'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
  ],
+ python_requires='>=3.3',
  py_modules=['aactivator'],
  entry_points={
  'console_scripts': [

tests/conftest.py

@@ -3,14 +3,20 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import os
+
 import pytest
-from py._path.local import LocalPath
 
 
 @pytest.fixture(autouse=True)
 def cwd():
- with LocalPath('/').as_cwd():
+ old_dir = os.getcwd()
+ os.chdir('/')
+
+ try:
  yield
+ finally:
+ os.chdir(old_dir)
 
 
 @pytest.fixture

tests/integration_test.py

@@ -8,6 +8,7 @@
 import re
 import shutil
 import sys
+from shlex import quote
 
 import pexpect
 import pytest
@@ -60,8 +61,6 @@ def expect_exact_better(proc, expected):
  proc.buffer.replace(b'\r', b'').replace(b'\n', b'\n ').decode('utf8'),
  )
  message = '\n'.join(message)
- if sys.version_info < (3, 0):
- message = message.encode('utf8')
  raise AssertionError(message)
 
 
@@ -114,7 +113,6 @@ def parse_tests(tests):
 
 def shellquote(cmd):
  """transform a python command-list to a shell command-string"""
- from pipes import quote
  return ' '.join(quote(arg) for arg in cmd)
 
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py36
+envlist = py36
 
 [testenv]
 deps = -rrequirements-dev.txt