1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
package_dir={"": "src"},
py_modules=["ghdiff", "ipython_magic"],
tests_require=["zope.testrunner"],
- install_requires=["six", "chardet"],
+ install_requires=["chardet"],
test_suite="tests.test_suite",
entry_points={
'console_scripts': [
--- a/src/ghdiff.py
+++ b/src/ghdiff.py
@@ -4,7 +4,6 @@
import chardet
import difflib
import optparse
-import six
import sys
import xml.sax.saxutils
@@ -54,9 +53,9 @@
def diff(a, b, n=3, css=True):
- if isinstance(a, six.string_types):
+ if isinstance(a, str):
a = a.splitlines()
- if isinstance(b, six.string_types):
+ if isinstance(b, str):
b = b.splitlines()
return colorize(list(difflib.unified_diff(a, b, n=n)), css=css)
@@ -67,7 +66,7 @@
def _colorize(diff):
- if isinstance(diff, six.string_types):
+ if isinstance(diff, str):
lines = diff.splitlines()
else:
lines = diff
|
