Skip to content

Commit ee53e69

Browse files
committed
update: python functions
1 parent 5def675 commit ee53e69

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

source/duplication.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env python3
2+
3+
def list_duplicates(seq):
4+
seen = set()
5+
seen_add = seen.add
6+
# adds all elements it doesn't know yet to seen and all other to seen_twice
7+
seen_twice = set( x for x in seq if x in seen or seen_add(x) )
8+
# turn the set into a list (as requested)
9+
return list( seen_twice )

source/json_generator.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import fnmatch
55
from json import dumps
66

7-
def writeJson(data, filename):
7+
def write_json(data, filename):
88
try:
99
jsondata = dumps(data, indent=2, skipkeys=True, sort_keys=True)
1010
fd = open(filename, 'w')
@@ -14,16 +14,16 @@ def writeJson(data, filename):
1414
print 'ERROR writing', filename
1515
pass
1616

17-
def getDir(path, ext):
17+
def get_dir(path, ext):
1818
matches = []
1919
for root, dirnames, filenames in os.walk(path):
2020
for filename in fnmatch.filter(filenames, ext):
2121
matches.append(os.path.join(root, filename))
2222
return matches
2323

24-
def getJson():
24+
def get_json():
2525
result = []
26-
for count, file in enumerate(getDir('../snippets/', '*.sublime-snippet'), start=1):
26+
for count, file in enumerate(get_dir('../snippets/', '*.sublime-snippet'), start=1):
2727
line = open(file)
2828
content = line.read()
2929
trigger = content.split('<tabTrigger>')[1].split('</tabTrigger>')[0]
@@ -34,5 +34,5 @@ def getJson():
3434
return result
3535

3636

37-
writeJson(getJson(), "../snippets.json")
37+
write_json(get_json(), "../snippets.json")
3838

tests/test.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,16 @@
22

33
import sys
44
sys.path.append('../source/')
5-
from json_generator import getJson
5+
from json_generator import get_json
6+
from duplication import list_duplicates
67
import json
78
import re
89
import unittest
910

10-
def list_duplicates(seq):
11-
seen = set()
12-
seen_add = seen.add
13-
# adds all elements it doesn't know yet to seen and all other to seen_twice
14-
seen_twice = set( x for x in seq if x in seen or seen_add(x) )
15-
# turn the set into a list (as requested)
16-
return list( seen_twice )
17-
1811
class TestDuplicatesMethods(unittest.TestCase):
1912

2013
def test_duplicates(self):
21-
json = getJson()
14+
json = get_json()
2215
triggers = []
2316

2417
for snippet in json:

0 commit comments

Comments
 (0)