Datasets:

zirui3

/

TSSB-3M-ext

like 0

folium

254b14c1e9da4c508a8c1ad1e412c1131879a499

1810e33b9a6271cacbf00ce9d1d9caf17aaf4dab

setup.py

https://github.com/matsuken92/folium

@@ -42,7 +42,7 @@ setup( author='Rob Story', author_email='[email protected]', license='MIT License', - url='https://github.com/wrobstory/folium', + url='https://github.com/python-visualization/folium', keywords='data visualization', classifiers=['Development Status :: 4 - Beta', 'Programming Language :: Python :: 2.7',

url = 'https://github.com/wrobstory/folium' ,

url = 'https://github.com/python-visualization/folium' ,

CHANGE_STRING_LITERAL

[["Update", ["string:'https://github.com/wrobstory/folium'", 3, 9, 3, 46], "'https://github.com/python-visualization/folium'"]]

matsuken92/folium@254b14c1e9da4c508a8c1ad1e412c1131879a499

Fixed github URL.

folium

9f5e4a94cb4129677c6873532f1242416c871cc2

c697485ea85d65bea7f5430b120ae630e821a7fa

tests/folium_tests.py

https://github.com/matsuken92/folium

@@ -416,7 +416,7 @@ class testFolium(object): map.create_map() def test_line(self): - '''Test multi_polyline''' + '''Test line''' line_temp = self.env.get_template('polyline.js')

'''Test multi_polyline'''

'''Test line'''

CHANGE_STRING_LITERAL

[["Update", ["string:'''Test multi_polyline'''", 3, 9, 3, 34], "'''Test line'''"]]

matsuken92/folium@9f5e4a94cb4129677c6873532f1242416c871cc2

Fixed test name.

folium

85401724a52c9f8176c9dc720be090ed7ab31a8b

ab5f47678d29a60435a61a1fbb52d4aa58605e21

folium/folium.py

https://github.com/matsuken92/folium

@@ -800,7 +800,7 @@ class Map(object): else: width += 75 height += 50 - max_width = self.map_size['width'] + max_width = max([self.map_size['width'], width]) vega_id = '#' + div_id popup_temp = self.env.get_template('vega_marker.js') return popup_temp.render({'mark': mark, 'div_id': div_id,

max_width = self . map_size [ 'width' ]

max_width = max ( [ self . map_size [ 'width' ] , width ] )

SINGLE_STMT

[["Insert", ["assignment", 3, 17, 3, 51], ["call", "N0"], 2], ["Insert", "N0", ["identifier:max", "T"], 0], ["Insert", "N0", ["argument_list", "N1"], 1], ["Insert", "N1", ["(:(", "T"], 0], ["Insert", "N1", ["list", "N2"], 1], ["Insert", "N1", ["):)", "T"], 2], ["Insert", "N2", ["[:[", "T"], 0], ["Move", "N2", ["subscript", 3, 29, 3, 51], 1], ["Insert", "N2", [",:,", "T"], 2], ["Insert", "N2", ["identifier:width", "T"], 3], ["Insert", "N2", ["]:]", "T"], 4]]

matsuken92/folium@85401724a52c9f8176c9dc720be090ed7ab31a8b

Fix vincent max popup width.

folium

9e1e50d40edccac666b82e2914b1e74fd570d06a

87eae3a0fe017d641707bb0481182945970c6d7e

folium/utilities.py

https://github.com/matsuken92/folium

@@ -159,7 +159,7 @@ def color_brewer(color_code, n=6): 'RdGy': ['#b2182b', '#ef8a62', '#fddbc7', '#e0e0e0', '#999999', '#4d4d4d'], 'RdYlBu': ['#d73027', '#fc8d59', '#fee090', '#e0f3f8', '#91bfdb', '#4575b4'], 'RdYlGn': ['#d73027', '#fc8d59', '#fee08b', '#d9ef8b', '#91cf60', '#1a9850'], - 'Spectral': ['#d53e4f' '#fc8d59' '#fee08b' '#e6f598' '#99d594' '#3288bd'], + 'Spectral': ['#d53e4f', '#fc8d59', '#fee08b', '#e6f598', '#99d594', '#3288bd'], 'Accent': ['#7fc97f', '#beaed4', '#fdc086', '#ffff99', '#386cb0', '#f0027f'], 'Dark2': ['#1b9e77', '#d95f02', '#7570b3', '#e7298a', '#66a61e', '#e6ab02'], 'Paired': ['#a6cee3', '#1f78b4', '#b2df8a', '#33a02c', '#fb9a99', '#e31a1c'],

'Spectral' : [ '#d53e4f' '#fc8d59' '#fee08b' '#e6f598' '#99d594' '#3288bd' ] ,

'Spectral' : [ '#d53e4f' , '#fc8d59' , '#fee08b' , '#e6f598' , '#99d594' , '#3288bd' ] ,

SINGLE_STMT

[["Move", ["subscript", 3, 16, 3, 89], ["string:'#d53e4f'", 3, 29, 3, 38], 3], ["Insert", ["subscript", 3, 16, 3, 89], [",:,", "T"], 4], ["Move", ["subscript", 3, 16, 3, 89], ["string:'#fc8d59'", 3, 39, 3, 48], 5], ["Insert", ["subscript", 3, 16, 3, 89], [",:,", "T"], 6], ["Move", ["subscript", 3, 16, 3, 89], ["string:'#fee08b'", 3, 49, 3, 58], 7], ["Insert", ["subscript", 3, 16, 3, 89], [",:,", "T"], 8], ["Move", ["subscript", 3, 16, 3, 89], ["string:'#e6f598'", 3, 59, 3, 68], 9], ["Insert", ["subscript", 3, 16, 3, 89], [",:,", "T"], 10], ["Move", ["subscript", 3, 16, 3, 89], ["string:'#99d594'", 3, 69, 3, 78], 11], ["Insert", ["subscript", 3, 16, 3, 89], [",:,", "T"], 12], ["Move", ["subscript", 3, 16, 3, 89], ["string:'#3288bd'", 3, 79, 3, 88], 13], ["Delete", ["concatenated_string", 3, 29, 3, 88]]]

matsuken92/folium@9e1e50d40edccac666b82e2914b1e74fd570d06a

fix_spectral_bug

folium

2431c51863b45dbfe676b81440a06ae5b30aceb7

c9548ba02e7ee84f27e6b97dfcaa56739230d528

tests/test_folium.py

https://github.com/matsuken92/folium

@@ -543,7 +543,7 @@ class TestFolium(object): map.polygon_marker(location=[45.5, -122.5]) # Test write. - map.create_map() + map._parent.render() def test_line(self): """Test line."""

map . create_map ( )

map . _parent . render ( )

SINGLE_STMT

[["Insert", ["attribute", 3, 9, 3, 23], ["attribute", "N0"], 0], ["Insert", ["attribute", 3, 9, 3, 23], [".:.", "T"], 1], ["Insert", ["attribute", 3, 9, 3, 23], ["identifier:render", "T"], 2], ["Move", "N0", ["identifier:map", 3, 9, 3, 12], 0], ["Move", "N0", [".:.", 3, 12, 3, 13], 1], ["Update", ["identifier:create_map", 3, 13, 3, 23], "_parent"], ["Move", "N0", ["identifier:create_map", 3, 13, 3, 23], 2]]

matsuken92/folium@2431c51863b45dbfe676b81440a06ae5b30aceb7

Fix test_create_map

folium

ab7c3dd939640f8b355d89299be55d78675ddf79

9fe75937be7a540d15ad46560951edaaa209ef22

folium/element.py

https://github.com/matsuken92/folium

@@ -358,7 +358,7 @@ class Html(Element): self._template = Template(u""" <div id="{{this.get_name()}}" style="width: {{this.width[0]}}{{this.width[1]}}; height: {{this.height[0]}}{{this.height[1]}};"> - {{this.data}}</div> + {{this.data|e}}</div> """)

self . _template = Template ( u""" <div id="{{this.get_name()}}" style="width: {{this.width[0]}}{{this.width[1]}}; height: {{this.height[0]}}{{this.height[1]}};"> {{this.data}}</div> """ )

self . _template = Template ( u""" <div id="{{this.get_name()}}" style="width: {{this.width[0]}}{{this.width[1]}}; height: {{this.height[0]}}{{this.height[1]}};"> {{this.data|e}}</div> """ )

CHANGE_STRING_LITERAL

[["Update", ["string:u\"\"\"\n <div id=\"{{this.get_name()}}\"\n style=\"width: {{this.width[0]}}{{this.width[1]}}; height: {{this.height[0]}}{{this.height[1]}};\">\n {{this.data}}</div>\n \"\"\"", 0, 35, 4, 20], "u\"\"\"\n <div id=\"{{this.get_name()}}\"\n style=\"width: {{this.width[0]}}{{this.width[1]}}; height: {{this.height[0]}}{{this.height[1]}};\">\n {{this.data|e}}</div>\n \"\"\""]]

matsuken92/folium@ab7c3dd939640f8b355d89299be55d78675ddf79

Fix issue #252

shadowsocksr

661fbbfb8b6c1888f760a57bbeee81ae616a9b2a

a3344d9f1c5b88184778986ef324481fcaa41204

asyncmgr.py

https://github.com/myheartsgoon/shadowsocksr

@@ -69,7 +69,7 @@ class ServerMgr(object): elif args[3] == '1': server_pool.ServerPool.get_instance().new_server(args[1], args[2]) - def handle_event(self, sock, event): + def handle_event(self, sock, fd, event): if sock != self._sock: return if event & eventloop.POLL_ERR:

def handle_event ( self , sock , event ) : if sock != self . _sock : return if event & eventloop . POLL_ERR :

def handle_event ( self , sock , fd , event ) : if sock != self . _sock : return if event & eventloop . POLL_ERR :

SINGLE_STMT

[["Insert", ["parameters", 3, 21, 3, 40], ["identifier:fd", "T"], 5], ["Insert", ["parameters", 3, 21, 3, 40], [",:,", "T"], 6]]

myheartsgoon/shadowsocksr@661fbbfb8b6c1888f760a57bbeee81ae616a9b2a

fix handle_event

shadowsocksr

e060fd5b4d9e7f0ab4921b3dc9212de83816cff4

93c94fbe3c781f477e65cd34552ec8a0e43ec541

shadowsocks/obfsplugin/http_simple.py

https://github.com/myheartsgoon/shadowsocksr

@@ -238,7 +238,7 @@ class random_head(object): if self.has_sent_header: return buf self.has_sent_header = True - return os.urandom(common.ord(os.urandom(1)[0]) % 96) + return os.urandom(common.ord(os.urandom(1)[0]) % 96 + 1) def server_decode(self, buf): if self.has_recv_header:

return os . urandom ( common . ord ( os . urandom ( 1 ) [ 0 ] ) % 96 )

return os . urandom ( common . ord ( os . urandom ( 1 ) [ 0 ] ) % 96 + 1 )

SINGLE_STMT

[["Move", ["binary_operator", 3, 27, 3, 60], ["binary_operator", 3, 27, 3, 60], 0], ["Insert", ["binary_operator", 3, 27, 3, 60], ["+:+", "T"], 1], ["Insert", ["binary_operator", 3, 27, 3, 60], ["integer:1", "T"], 2]]

myheartsgoon/shadowsocksr@e060fd5b4d9e7f0ab4921b3dc9212de83816cff4

tiny bug

shadowsocksr

8ee4cd513a92dac893266490ae9477b2810b839b

5137377580d85102be503673016582dfdcc4118b

shadowsocks/obfsplugin/verify_simple.py

https://github.com/myheartsgoon/shadowsocksr

@@ -422,7 +422,7 @@ class auth_simple(verify_base): def client_pre_encrypt(self, buf): ret = b'' if not self.has_sent_header: - datalen = max(len(buf), common.ord(os.urandom(1)[0]) % 32 + 4) + datalen = min(len(buf), common.ord(os.urandom(1)[0]) % 32 + 4) ret += self.pack_data(self.auth_data() + buf[:datalen]) buf = buf[datalen:] self.has_sent_header = True

datalen = max ( len ( buf ) , common . ord ( os . urandom ( 1 ) [ 0 ] ) % 32 + 4 )

datalen = min ( len ( buf ) , common . ord ( os . urandom ( 1 ) [ 0 ] ) % 32 + 4 )

WRONG_FUNCTION_NAME

[["Update", ["identifier:max", 3, 23, 3, 26], "min"]]

myheartsgoon/shadowsocksr@8ee4cd513a92dac893266490ae9477b2810b839b

a stupid bug

shadowsocksr

3930cfc72653cde212f9b95efd2fcd62bb4749c2

84275b681565b13c002720c56d9be4abb6e065da

shadowsocks/obfsplugin/verify.py

https://github.com/myheartsgoon/shadowsocksr

@@ -295,7 +295,7 @@ class verify_sha1(verify_base): ret = b'' if not self.has_sent_header: datalen = self.get_head_size(buf, 30) - ret += self.pack_auth_data(buf[datalen:]) + ret += self.pack_auth_data(buf[:datalen]) buf = buf[datalen:] self.has_sent_header = True while len(buf) > self.unit_len:

ret += self . pack_auth_data ( buf [ datalen : ] )

ret += self . pack_auth_data ( buf [ : datalen ] )

SINGLE_STMT

[["Move", ["identifier:datalen", 3, 44, 3, 51], ["slice", 3, 44, 3, 52], 2]]

myheartsgoon/shadowsocksr@3930cfc72653cde212f9b95efd2fcd62bb4749c2

fix a bug

shadowsocksr

443c4f35c21efd9fa532c05aafc3c9137decdf5f

13579f1ca437f81175b638ebc2a49beec0ff33d6

shadowsocks/asyncdns.py

https://github.com/myheartsgoon/shadowsocksr

@@ -81,7 +81,7 @@ def detect_ipv6_supprot(): if 'has_ipv6' in dir(socket): try: s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM) - s.connect(('ipv6.google.com', 0)) + s.connect(('::1', 0)) print('IPv6 support') return True except:

s . connect ( ( 'ipv6.google.com' , 0 ) )

s . connect ( ( '::1' , 0 ) )

CHANGE_STRING_LITERAL

[["Update", ["string:'ipv6.google.com'", 3, 24, 3, 41], "'::1'"]]

myheartsgoon/shadowsocksr@443c4f35c21efd9fa532c05aafc3c9137decdf5f

fix IPv6 detect

shadowsocksr

b151bf815fdb9df5e2d13bef825e816ffb9c2872

ddcf7f796f50aa766f22411112c4b5338547f822

shadowsocks/crypto/sodium.py

https://github.com/myheartsgoon/shadowsocksr

@@ -56,7 +56,7 @@ def load_libsodium(): libsodium.crypto_stream_chacha20_ietf_xor_ic.restype = c_int libsodium.crypto_stream_chacha20_ietf_xor_ic.argtypes = (c_void_p, c_char_p, c_ulonglong, - c_char_p, c_ulonglong, + c_char_p, c_ulong, c_char_p) except: pass

libsodium . crypto_stream_chacha20_ietf_xor_ic . argtypes = ( c_void_p , c_char_p , c_ulonglong , c_char_p , c_ulonglong , c_char_p )

libsodium . crypto_stream_chacha20_ietf_xor_ic . argtypes = ( c_void_p , c_char_p , c_ulonglong , c_char_p , c_ulong , c_char_p )

CHANGE_IDENTIFIER_USED

[["Update", ["identifier:c_ulonglong", 3, 67, 3, 78], "c_ulong"]]

myheartsgoon/shadowsocksr@b151bf815fdb9df5e2d13bef825e816ffb9c2872

fix "chacha20-ietf"

shadowsocksr

e56c5e4b90f0f72998a299072424af5ac22b009a

519c84719fb9017de504db677b9c9cb9bb586654

shadowsocks/server.py

https://github.com/myheartsgoon/shadowsocksr

@@ -74,7 +74,7 @@ def main(): if type(password_obfs) == list: password = password_obfs[0] obfs = password_obfs[1] - if len(password_obfs) >= 2: + if len(password_obfs) > 2: protocol = password_obfs[2] elif type(password_obfs) == dict: password = password_obfs.get('password', 'm')

if len ( password_obfs ) >= 2 : protocol = password_obfs [ 2 ]

if len ( password_obfs ) > 2 : protocol = password_obfs [ 2 ]

CHANGE_BINARY_OPERATOR

[["Insert", ["comparison_operator", 3, 16, 3, 39], [">:>", "T"], 1], ["Delete", [">=:>=", 3, 35, 3, 37]]]

myheartsgoon/shadowsocksr@e56c5e4b90f0f72998a299072424af5ac22b009a

fix index

shadowsocksr

81b059759147545a06a8167a6b7b240ef9246b3c

e76939981a379c20351048a115311db9e056a6e8

shadowsocks/obfsplugin/http_simple.py

https://github.com/myheartsgoon/shadowsocksr

@@ -79,7 +79,7 @@ class http_simple(plain.plain): def encode_head(self, buf): ret = b'' for ch in buf: - ret += '%' + binascii.hexlify(chr(ch)) + ret += b'%' + binascii.hexlify(chr(ch)) return ret def client_encode(self, buf):

ret += '%' + binascii . hexlify ( chr ( ch ) )

ret += b'%' + binascii . hexlify ( chr ( ch ) )

CHANGE_BINARY_OPERAND

[["Update", ["string:'%'", 3, 20, 3, 23], "b'%'"]]

myheartsgoon/shadowsocksr@81b059759147545a06a8167a6b7b240ef9246b3c

fix "bytes" in "encode_head"

shadowsocksr

a49b21ee2c1c9bfe9f0f5b58e418d366463d8807

81b059759147545a06a8167a6b7b240ef9246b3c

shadowsocks/obfsplugin/http_simple.py

https://github.com/myheartsgoon/shadowsocksr

@@ -79,7 +79,7 @@ class http_simple(plain.plain): def encode_head(self, buf): ret = b'' for ch in buf: - ret += b'%' + binascii.hexlify(chr(ch)) + ret += b'%' + to_bytes(binascii.hexlify(chr(ch))) return ret def client_encode(self, buf):

ret += b'%' + binascii . hexlify ( chr ( ch ) )

ret += b'%' + to_bytes ( binascii . hexlify ( chr ( ch ) ) )

ADD_FUNCTION_AROUND_EXPRESSION

[["Insert", ["call", 3, 27, 3, 52], ["identifier:to_bytes", "T"], 0], ["Insert", ["call", 3, 27, 3, 52], ["argument_list", "N0"], 1], ["Insert", "N0", ["(:(", "T"], 0], ["Move", "N0", ["call", 3, 27, 3, 52], 1], ["Insert", "N0", ["):)", "T"], 2]]

myheartsgoon/shadowsocksr@a49b21ee2c1c9bfe9f0f5b58e418d366463d8807

fix "bytes" in "encode_head" 2

shadowsocksr

cb866dc8fe524d15264c2359f743fcb1e8d4d2f2

be922ba7c2e5ebe6f073033ea5cf05fda6a3427c

shadowsocks/shell.py

https://github.com/myheartsgoon/shadowsocksr

@@ -236,7 +236,7 @@ def get_config(is_local): config['obfs_param'] = to_str(config.get('obfs_param', '')) config['port_password'] = config.get('port_password', None) config['timeout'] = int(config.get('timeout', 300)) - config['udp_timeout'] = int(config.get('udp_timeout', config['timeout'])) + config['udp_timeout'] = int(config.get('udp_timeout', 120)) config['udp_cache'] = int(config.get('udp_cache', 64)) config['fast_open'] = config.get('fast_open', False) config['workers'] = config.get('workers', 1)

config [ 'udp_timeout' ] = int ( config . get ( 'udp_timeout' , config [ 'timeout' ] ) )

config [ 'udp_timeout' ] = int ( config . get ( 'udp_timeout' , 120 ) )

SINGLE_STMT

[["Insert", ["argument_list", 3, 43, 3, 77], ["integer:120", "T"], 3], ["Delete", ["identifier:config", 3, 59, 3, 65]], ["Delete", ["[:[", 3, 65, 3, 66]], ["Delete", ["string:'timeout'", 3, 66, 3, 75]], ["Delete", ["]:]", 3, 75, 3, 76]], ["Delete", ["subscript", 3, 59, 3, 76]]]

myheartsgoon/shadowsocksr@cb866dc8fe524d15264c2359f743fcb1e8d4d2f2

set udp_timeout default value

shadowsocksr

2e65becc44e877ef4924102749cceb402e3cd38b

c5ca6bd80aa2fc7278f7486e06bc050df54d9893

shadowsocks/udprelay.py

https://github.com/myheartsgoon/shadowsocksr

@@ -1080,7 +1080,7 @@ class UDPRelay(object): client = socket.socket(af, socktype, proto) client.setblocking(False) is_dns = False - if len(data) > 12 and data[11:19] == b"\x00\x01\x00\x00\x00\x00\x00\x00": + if len(data) > 20 and data[11:19] == b"\x00\x01\x00\x00\x00\x00\x00\x00": is_dns = True else: pass

if len ( data ) > 12 and data [ 11 : 19 ] == b"\x00\x01\x00\x00\x00\x00\x00\x00" : is_dns = True else : pass

if len ( data ) > 20 and data [ 11 : 19 ] == b"\x00\x01\x00\x00\x00\x00\x00\x00" : is_dns = True else : pass

CHANGE_NUMERIC_LITERAL

[["Update", ["integer:12", 3, 28, 3, 30], "20"]]

myheartsgoon/shadowsocksr@2e65becc44e877ef4924102749cceb402e3cd38b

fix data size

shadowsocksr

b344bc236b5a28ada617e462b3a4f8dcc8fb595f

9b14c019bb311b9b9ab86ff2178a511025c405e2

shadowsocks/asyncdns.py

https://github.com/myheartsgoon/shadowsocksr

@@ -289,7 +289,7 @@ class DNSResolver(object): for line in content: line = line.strip() if line: - parts = line.split(' ', 1) + parts = line.split(b' ', 1) if len(parts) >= 2: server = parts[0] port = int(parts[1])

parts = line . split ( ' ' , 1 )

parts = line . split ( b' ' , 1 )

CHANGE_STRING_LITERAL

[["Update", ["string:' '", 3, 44, 3, 47], "b' '"]]

myheartsgoon/shadowsocksr@b344bc236b5a28ada617e462b3a4f8dcc8fb595f

fix bytes

shadowsocksr

050270a7258a3478797eb92bc647590f52b190a7

f5434bdbd02290050140f3b396bea6bb773f2850

shadowsocks/tcprelay.py

https://github.com/myheartsgoon/shadowsocksr

@@ -668,7 +668,7 @@ class TCPRelayHandler(object): try: data, sendback = self._protocol.server_post_decrypt(data) if sendback: - backdata = self._protocol.server_pre_encrypt('') + backdata = self._protocol.server_pre_encrypt(b'') backdata = self._encryptor.encrypt(backdata) backdata = self._obfs.server_encode(backdata) try:

backdata = self . _protocol . server_pre_encrypt ( '' )

backdata = self . _protocol . server_pre_encrypt ( b'' )

CHANGE_STRING_LITERAL

[["Update", ["string:''", 3, 74, 3, 76], "b''"]]

myheartsgoon/shadowsocksr@050270a7258a3478797eb92bc647590f52b190a7

fix send back str type

shadowsocksr

2c4600cf0e60d9a26766d20c0e7ef6a850081272

b922d70a87167174d438ab01e2ac15c48b5ea9dd

db_transfer.py

https://github.com/myheartsgoon/shadowsocksr

@@ -413,7 +413,7 @@ class Dbv3Transfer(DbTransfer): cur = conn.cursor() - cur.execute("SELECT `traffic_rate` FROM ss_node where `id`='" + str(get_config().NODE_ID) + "'") + cur.execute("SELECT `traffic_rate` FROM ss_node where `id`='" + str(self.cfg["node_id"]) + "'") nodeinfo = cur.fetchone() if nodeinfo == None :

cur . execute ( "SELECT `traffic_rate` FROM ss_node where `id`='" + str ( get_config ( ) . NODE_ID ) + "'" )

cur . execute ( "SELECT `traffic_rate` FROM ss_node where `id`='" + str ( self . cfg [ "node_id" ] ) + "'" )

SINGLE_STMT

[["Insert", ["argument_list", 3, 70, 3, 92], ["subscript", "N0"], 1], ["Insert", "N0", ["attribute", "N1"], 0], ["Insert", "N0", ["[:[", "T"], 1], ["Insert", "N0", ["string:\"node_id\"", "T"], 2], ["Insert", "N0", ["]:]", "T"], 3], ["Update", ["identifier:get_config", 3, 71, 3, 81], "self"], ["Move", "N1", ["identifier:get_config", 3, 71, 3, 81], 0], ["Move", "N1", [".:.", 3, 83, 3, 84], 1], ["Insert", "N1", ["identifier:cfg", "T"], 2], ["Delete", ["(:(", 3, 81, 3, 82]], ["Delete", ["):)", 3, 82, 3, 83]], ["Delete", ["argument_list", 3, 81, 3, 83]], ["Delete", ["call", 3, 71, 3, 83]], ["Delete", ["identifier:NODE_ID", 3, 84, 3, 91]], ["Delete", ["attribute", 3, 71, 3, 91]]]

myheartsgoon/shadowsocksr@2c4600cf0e60d9a26766d20c0e7ef6a850081272

fix get node_id

shadowsocksr

a440a726f6d3a25fe2eeac94786580f462a314a7

3525d3d86aab16b7b5d096d5959df88c13554608

db_transfer.py

https://github.com/myheartsgoon/shadowsocksr

@@ -426,7 +426,7 @@ class Dbv3Transfer(DbTransfer): node_info_dict = {} for column in range(len(nodeinfo)): - node_info_dict[node_info_keys[column]] = r[column] + node_info_dict[node_info_keys[column]] = nodeinfo[column] self.cfg['transfer_mul'] = float(node_info_dict['traffic_rate']) cur = conn.cursor()

node_info_dict [ node_info_keys [ column ] ] = r [ column ]

node_info_dict [ node_info_keys [ column ] ] = nodeinfo [ column ]

CHANGE_IDENTIFIER_USED

[["Update", ["identifier:r", 3, 45, 3, 46], "nodeinfo"]]

myheartsgoon/shadowsocksr@a440a726f6d3a25fe2eeac94786580f462a314a7

fix get node_id

shadowsocksr

d47905f01d1dc93dd4497439c9503ba2e3d30d3e

f3808a306fbafb1e2a451f1ac0b44e53666969a8

shadowsocks/tcprelay.py

https://github.com/myheartsgoon/shadowsocksr

@@ -579,7 +579,7 @@ class TCPRelayHandler(object): remote_sock.ioctl(socket.SIO_KEEPALIVE_VALS, (1, 1000 * val_idle, 1000 * val_intvl)) elif platform.system() in ["Darwin"]: #OSX TCP_KEEPALIVE = 0x10 - sock.setsockopt(socket.SOL_TCP, TCP_KEEPALIVE, val_intvl * 2) + remote_sock.setsockopt(socket.SOL_TCP, TCP_KEEPALIVE, val_intvl * 2) if not self._is_local: bind_addr = ''

sock . setsockopt ( socket . SOL_TCP , TCP_KEEPALIVE , val_intvl * 2 )

remote_sock . setsockopt ( socket . SOL_TCP , TCP_KEEPALIVE , val_intvl * 2 )

SAME_FUNCTION_WRONG_CALLER

[["Update", ["identifier:sock", 3, 17, 3, 21], "remote_sock"]]

myheartsgoon/shadowsocksr@d47905f01d1dc93dd4497439c9503ba2e3d30d3e

fix name

shadowsocksr

b3fcee662a2318e0868839b4eaa7e7ebbe004c35

e1aa68029dd2e3eace5ac40d3b2853eafe22d4f1

shadowsocks/obfsplugin/auth.py

https://github.com/myheartsgoon/shadowsocksr

@@ -188,7 +188,7 @@ class auth_sha1(verify_base): def __init__(self, method): super(auth_sha1, self).__init__(method) self.recv_buf = b'' - self.unit_len = 8100 + self.unit_len = 8000 self.decrypt_packet_num = 0 self.raw_trans = False self.has_sent_header = False

self . unit_len = 8100

self . unit_len = 8000

CHANGE_NUMERIC_LITERAL

[["Update", ["integer:8100", 3, 25, 3, 29], "8000"]]

myheartsgoon/shadowsocksr@b3fcee662a2318e0868839b4eaa7e7ebbe004c35

fix unit_len in auth_sha1

shadowsocksr

2637c8d1c72425508cec6f6998dd851027f77785

88017d964373bd045231049ff2eb5aa66543827f

shadowsocks/crypto/sodium.py

https://github.com/myheartsgoon/shadowsocksr

@@ -17,7 +17,7 @@ from __future__ import absolute_import, division, print_function, \ with_statement -from ctypes import c_char_p, c_int, c_ulonglong, byref, \ +from ctypes import c_char_p, c_int, c_ulong, c_ulonglong, byref, \ create_string_buffer, c_void_p from shadowsocks.crypto import util

from ctypes import c_char_p , c_int , c_ulonglong , byref , create_string_buffer , c_void_p

from ctypes import c_char_p , c_int , c_ulong , c_ulonglong , byref , create_string_buffer , c_void_p

SINGLE_STMT

[["Insert", ["import_from_statement", 3, 1, 4, 35], ["dotted_name", "N0"], 7], ["Insert", ["import_from_statement", 3, 1, 4, 35], [",:,", "T"], 8], ["Insert", "N0", ["identifier:c_ulong", "T"], 0]]

myheartsgoon/shadowsocksr@2637c8d1c72425508cec6f6998dd851027f77785

fix chacha20-ietf

shadowsocksr

a02e995a8a36a432b9ce2720672ae28d9047f3a6

2637c8d1c72425508cec6f6998dd851027f77785

shadowsocks/eventloop.py

https://github.com/myheartsgoon/shadowsocksr

@@ -99,7 +99,7 @@ class KqueueLoop(object): self.register(fd, mode) def close(self): - self.kqueue.close() + self._kqueue.close() class SelectLoop(object):

self . kqueue . close ( )

self . _kqueue . close ( )

CHANGE_ATTRIBUTE_USED

[["Update", ["identifier:kqueue", 3, 14, 3, 20], "_kqueue"]]

myheartsgoon/shadowsocksr@a02e995a8a36a432b9ce2720672ae28d9047f3a6

fix bug at KqueueLoop close (#117)

shadowsocksr

e7db6d4248d628f211c91f458caa5a308c9184ac

a407bcc5684d3c5475d1b39c226bed8c326eb3a0

mujson_mgr.py

https://github.com/myheartsgoon/shadowsocksr

@@ -92,7 +92,7 @@ class MuMgr(object): def add(self, user): up = {'enable': True, 'u': 0, 'd': 0, 'method': "aes-128-cfb", - 'protocol': "auth_sha1_v3_compatible", + 'protocol': "auth_sha1_v4_compatible", 'obfs': "tls1.2_ticket_auth_compatible", 'transfer_enable': 1125899906842624} up['passwd'] = self.rand_pass()

up = { 'enable' : True , 'u' : 0 , 'd' : 0 , 'method' : "aes-128-cfb" , 'protocol' : "auth_sha1_v3_compatible" , 'obfs' : "tls1.2_ticket_auth_compatible" , 'transfer_enable' : 1125899906842624 }

up = { 'enable' : True , 'u' : 0 , 'd' : 0 , 'method' : "aes-128-cfb" , 'protocol' : "auth_sha1_v4_compatible" , 'obfs' : "tls1.2_ticket_auth_compatible" , 'transfer_enable' : 1125899906842624 }

CHANGE_STRING_LITERAL

[["Update", ["string:\"auth_sha1_v3_compatible\"", 3, 15, 3, 40], "\"auth_sha1_v4_compatible\""]]

myheartsgoon/shadowsocksr@e7db6d4248d628f211c91f458caa5a308c9184ac

fix typo

shadowsocksr

2eaca2faeaa2fb29d079c06507813d0d8c03d514

cfb894400321afe362946a0056d65317fc2c2283

shadowsocks/obfsplugin/obfs_tls.py

https://github.com/myheartsgoon/shadowsocksr

@@ -149,7 +149,7 @@ class tls_ticket_auth(plain.plain): return buf if self.handshake_status == 8: ret = b'' - while len(buf) > 4096: + while len(buf) > 4196: size = struct.unpack('>H', os.urandom(2))[0] % 4096 + 100 ret += b"\x17" + self.tls_version + struct.pack('>H', size) + buf[:size] buf = buf[size:]

while len ( buf ) > 4096 : size = struct . unpack ( '>H' , os . urandom ( 2 ) ) [ 0 ] % 4096 + 100 ret += b"\x17" + self . tls_version + struct . pack ( '>H' , size ) + buf [ : size ] buf = buf [ size : ]

while len ( buf ) > 4196 : size = struct . unpack ( '>H' , os . urandom ( 2 ) ) [ 0 ] % 4096 + 100 ret += b"\x17" + self . tls_version + struct . pack ( '>H' , size ) + buf [ : size ] buf = buf [ size : ]

CHANGE_NUMERIC_LITERAL

[["Update", ["integer:4096", 3, 30, 3, 34], "4196"]]

myheartsgoon/shadowsocksr@2eaca2faeaa2fb29d079c06507813d0d8c03d514

fix typo

shadowsocksr

e5824be14579c8d8d32b6814fbbf03eddf6abef0

13ffdac2b76697f819ca2b5e21cb78079601fc66

shadowsocks/crypto/table.py

https://github.com/myheartsgoon/shadowsocksr

@@ -73,7 +73,7 @@ class NoneCipher(object): return data ciphers = { - 'none': (0, 0, NoneCipher), + 'none': (16, 0, NoneCipher), 'table': (0, 0, TableCipher) }

ciphers = { 'none' : ( 0 , 0 , NoneCipher ) , 'table' : ( 0 , 0 , TableCipher ) }

ciphers = { 'none' : ( 16 , 0 , NoneCipher ) , 'table' : ( 0 , 0 , TableCipher ) }

CHANGE_NUMERIC_LITERAL

[["Update", ["integer:0", 3, 14, 3, 15], "16"]]

myheartsgoon/shadowsocksr@e5824be14579c8d8d32b6814fbbf03eddf6abef0

fix none encrypt key size

shadowsocksr

9c794624e0e6f577d7198de4fbe7de69a349448e

ccacef155611a1cd87299b86a76311a2551e88ff

shadowsocks/obfsplugin/auth.py

https://github.com/myheartsgoon/shadowsocksr

@@ -1224,7 +1224,7 @@ class auth_aes128_sha1(auth_base): uid = os.urandom(4) if b':' in to_bytes(self.server_info.protocol_param): try: - items = to_bytes(self.server_info.protocol_param).split(':') + items = to_bytes(self.server_info.protocol_param).split(b':') self.user_key = self.hashfunc(items[1]).digest() uid = struct.pack('<I', int(items[0])) except:

items = to_bytes ( self . server_info . protocol_param ) . split ( ':' )

items = to_bytes ( self . server_info . protocol_param ) . split ( b':' )

CHANGE_STRING_LITERAL

[["Update", ["string:':'", 3, 73, 3, 76], "b':'"]]

myheartsgoon/shadowsocksr@9c794624e0e6f577d7198de4fbe7de69a349448e

fix auth_aes128_* client side

shadowsocksr

68693d5ec7475cf265684a68521562501584c995

7cfbe49806e2e0724e42af6ac3898883d68ffa09

db_transfer.py

https://github.com/myheartsgoon/shadowsocksr

@@ -278,7 +278,7 @@ class DbTransfer(TransferBase): import json config_path = get_config().MYSQL_CONFIG cfg = None - with open(config_path, 'r+') as f: + with open(config_path, 'rb+') as f: cfg = json.loads(f.read().decode('utf8')) if cfg:

with open ( config_path , 'r+' ) as f : cfg = json . loads ( f . read ( ) . decode ( 'utf8' ) )

with open ( config_path , 'rb+' ) as f : cfg = json . loads ( f . read ( ) . decode ( 'utf8' ) )

CHANGE_STRING_LITERAL

[["Update", ["string:'r+'", 3, 26, 3, 30], "'rb+'"]]

myheartsgoon/shadowsocksr@68693d5ec7475cf265684a68521562501584c995

fix bug under py3

shadowsocksr

5d479087a88647e9bcc0e2ea900b4903f5dedc83

26b4d8bc1822968d55da8ee68c344b31f9594d35

shadowsocks/obfsplugin/obfs_tls.py

https://github.com/myheartsgoon/shadowsocksr

@@ -107,7 +107,7 @@ class tls_ticket_auth(plain.plain): ext += b"\x00\x17\x00\x00" if host not in self.server_info.data.ticket_buf: self.server_info.data.ticket_buf[host] = os.urandom((struct.unpack('>H', os.urandom(2))[0] % 17 + 8) * 16) - ext += b"\x00\x23" + struct.pack('>H', len(self.ticket_size_buf[host])) + self.ticket_size_buf[host] + ext += b"\x00\x23" + struct.pack('>H', len(self.server_info.data.ticket_buf[host])) + self.server_info.data.ticket_buf[host] ext += binascii.unhexlify(b"000d001600140601060305010503040104030301030302010203") ext += binascii.unhexlify(b"000500050100000000") ext += binascii.unhexlify(b"00120000")

ext += b"\x00\x23" + struct . pack ( '>H' , len ( self . ticket_size_buf [ host ] ) ) + self . ticket_size_buf [ host ]

ext += b"\x00\x23" + struct . pack ( '>H' , len ( self . server_info . data . ticket_buf [ host ] ) ) + self . server_info . data . ticket_buf [ host ]

SINGLE_STMT

[["Insert", ["subscript", 3, 87, 3, 113], ["attribute", "N0"], 0], ["Insert", "N0", ["attribute", "N1"], 0], ["Insert", "N0", [".:.", "T"], 1], ["Insert", "N0", ["identifier:ticket_buf", "T"], 2], ["Move", "N1", ["attribute", 3, 87, 3, 107], 0], ["Insert", "N1", [".:.", "T"], 1], ["Insert", "N1", ["identifier:data", "T"], 2], ["Update", ["identifier:ticket_size_buf", 3, 92, 3, 107], "server_info"], ["Insert", ["subscript", 3, 56, 3, 82], ["attribute", "N2"], 0], ["Insert", "N2", ["attribute", "N3"], 0], ["Insert", "N2", [".:.", "T"], 1], ["Insert", "N2", ["identifier:ticket_buf", "T"], 2], ["Move", "N3", ["attribute", 3, 56, 3, 76], 0], ["Insert", "N3", [".:.", "T"], 1], ["Insert", "N3", ["identifier:data", "T"], 2], ["Update", ["identifier:ticket_size_buf", 3, 61, 3, 76], "server_info"]]

myheartsgoon/shadowsocksr@5d479087a88647e9bcc0e2ea900b4903f5dedc83

fix tls1.2_ticket_auth when it as a client

shadowsocksr

bf8bb8afe27dcde8b124c3b849d77474229d5d71

5d479087a88647e9bcc0e2ea900b4903f5dedc83

shadowsocks/obfsplugin/auth.py

https://github.com/myheartsgoon/shadowsocksr

@@ -1434,7 +1434,7 @@ class auth_aes128_sha1(auth_base): self.user_id = os.urandom(4) self.user_key = self.server_info.key buf += self.user_id - return buf + hmac.new(user_key, buf, self.hashfunc).digest()[:4] + return buf + hmac.new(self.user_key, buf, self.hashfunc).digest()[:4] def client_udp_post_decrypt(self, buf): user_key = self.server_info.key

return buf + hmac . new ( user_key , buf , self . hashfunc ) . digest ( ) [ : 4 ]

return buf + hmac . new ( self . user_key , buf , self . hashfunc ) . digest ( ) [ : 4 ]

SINGLE_STMT

[["Insert", ["argument_list", 3, 30, 3, 60], ["attribute", "N0"], 1], ["Insert", "N0", ["identifier:self", "T"], 0], ["Insert", "N0", [".:.", "T"], 1], ["Move", "N0", ["identifier:user_key", 3, 31, 3, 39], 2]]

myheartsgoon/shadowsocksr@bf8bb8afe27dcde8b124c3b849d77474229d5d71

fix undefined variable bug (#171)

shadowsocksr

bae7d7a0c2c1bf5b0a91898abf5a8db3342dd288

e1b199fc44008f226eb786f9aaa3b210aa3ed8b1

mujson_mgr.py

https://github.com/myheartsgoon/shadowsocksr

@@ -76,7 +76,7 @@ class MuMgr(object): for row in self.data.json: if int(row['port']) == muid: param = str(muid) + ':' + row['passwd'] - protocol_param = '/?protoparam=' + base64.urlsafe_b64encode(common.to_bytes(param)).replace("=", "") + protocol_param = '/?protoparam=' + common.to_str(base64.urlsafe_b64encode(common.to_bytes(param))).replace("=", "") break link = ("%s:%s:%s:%s:%s:%s" % (self.server_addr, user['port'], protocol, user['method'], obfs, common.to_str(base64.urlsafe_b64encode(common.to_bytes(user['passwd']))).replace("=", ""))) + protocol_param return "ssr://" + (encode and common.to_str(base64.urlsafe_b64encode(common.to_bytes(link))).replace("=", "") or link)

protocol_param = '/?protoparam=' + base64 . urlsafe_b64encode ( common . to_bytes ( param ) ) . replace ( "=" , "" )

protocol_param = '/?protoparam=' + common . to_str ( base64 . urlsafe_b64encode ( common . to_bytes ( param ) ) ) . replace ( "=" , "" )

ADD_FUNCTION_AROUND_EXPRESSION

[["Insert", ["call", 3, 42, 3, 90], ["attribute", "N0"], 0], ["Insert", ["call", 3, 42, 3, 90], ["argument_list", "N1"], 1], ["Insert", "N0", ["identifier:common", "T"], 0], ["Insert", "N0", [".:.", "T"], 1], ["Insert", "N0", ["identifier:to_str", "T"], 2], ["Insert", "N1", ["(:(", "T"], 0], ["Move", "N1", ["call", 3, 42, 3, 90], 1], ["Insert", "N1", ["):)", "T"], 2]]

myheartsgoon/shadowsocksr@bae7d7a0c2c1bf5b0a91898abf5a8db3342dd288

fix str type under py3

shadowsocksr

21ab52c62bd87b3b9e87fb2d26123b0489504779

20ba04c4ce2de34d67165c6ffaf18ce7d3122ec9

test.py

https://github.com/myheartsgoon/shadowsocksr

@@ -111,7 +111,7 @@ try: if local_ready and server_ready and p3 is None: time.sleep(1) p3 = Popen(['curl', 'http://www.example.com/', '-v', '-L', - '--socks5-hostname', '127.0.0.1:1080'], shell=False, + '--socks5-hostname', '127.0.0.1:1081'], shell=False, bufsize=0, close_fds=True) break

p3 = Popen ( [ 'curl' , 'http://www.example.com/' , '-v' , '-L' , '--socks5-hostname' , '127.0.0.1:1080' ] , shell = False , bufsize = 0 , close_fds = True )

p3 = Popen ( [ 'curl' , 'http://www.example.com/' , '-v' , '-L' , '--socks5-hostname' , '127.0.0.1:1081' ] , shell = False , bufsize = 0 , close_fds = True )

CHANGE_STRING_LITERAL

[["Update", ["string:'127.0.0.1:1080'", 3, 46, 3, 62], "'127.0.0.1:1081'"]]

myheartsgoon/shadowsocksr@21ab52c62bd87b3b9e87fb2d26123b0489504779

fix tests

shadowsocksr

77f74a06688de5ce0d19412de68f99bcf94193db

21ab52c62bd87b3b9e87fb2d26123b0489504779

shadowsocks/utils.py

https://github.com/myheartsgoon/shadowsocksr

@@ -30,7 +30,7 @@ import logging def check_python(): info = sys.version_info - if not (info.major == 2 and info.minor >= 6): + if not (info[0] == 2 and info[1] >= 6): print 'Python 2.6 or 2.7 required' sys.exit(1)

if not ( info . major == 2 and info . minor >= 6 ) : print 'Python 2.6 or 2.7 required' sys . exit ( 1 )

if not ( info [ 0 ] == 2 and info [ 1 ] >= 6 ) : print 'Python 2.6 or 2.7 required' sys . exit ( 1 )

SINGLE_STMT

[["Insert", ["comparison_operator", 3, 13, 3, 28], ["subscript", "N0"], 0], ["Insert", ["comparison_operator", 3, 33, 3, 48], ["subscript", "N1"], 0], ["Move", "N0", ["identifier:info", 3, 13, 3, 17], 0], ["Insert", "N0", ["[:[", "T"], 1], ["Insert", "N0", ["integer:0", "T"], 2], ["Insert", "N0", ["]:]", "T"], 3], ["Move", "N1", ["identifier:info", 3, 33, 3, 37], 0], ["Insert", "N1", ["[:[", "T"], 1], ["Insert", "N1", ["integer:1", "T"], 2], ["Insert", "N1", ["]:]", "T"], 3], ["Delete", [".:.", 3, 17, 3, 18]], ["Delete", ["identifier:major", 3, 18, 3, 23]], ["Delete", ["attribute", 3, 13, 3, 23]], ["Delete", [".:.", 3, 37, 3, 38]], ["Delete", ["identifier:minor", 3, 38, 3, 43]], ["Delete", ["attribute", 3, 33, 3, 43]]]

myheartsgoon/shadowsocksr@77f74a06688de5ce0d19412de68f99bcf94193db

fix python version check

shadowsocksr

f9fef0e2295ca3783217fe0c15ada8b0b2ee9bef

1dd722acc7aab30e9ea7c48d6a502e6826dfd472

shadowsocks/asyncdns.py

https://github.com/myheartsgoon/shadowsocksr

@@ -233,7 +233,7 @@ def is_ip(address): try: socket.inet_pton(family, address) return True - except (TypeError, OSError, IOError): + except (TypeError, ValueError, OSError, IOError): pass return False

try : socket . inet_pton ( family , address ) return True except ( TypeError , OSError , IOError ) : pass

try : socket . inet_pton ( family , address ) return True except ( TypeError , ValueError , OSError , IOError ) : pass

ADD_ELEMENTS_TO_ITERABLE

[["Move", ["identifier:OSError", 3, 28, 3, 35], ["tuple", 3, 16, 3, 45], 4], ["Insert", ["tuple", 3, 16, 3, 45], ["identifier:ValueError", "T"], 3], ["Insert", ["tuple", 3, 16, 3, 45], [",:,", "T"], 5]]

myheartsgoon/shadowsocksr@f9fef0e2295ca3783217fe0c15ada8b0b2ee9bef

add TypeError

shadowsocksr

c1cf02cbea8ade829eb30eaa83e5b282bd31b32a

68b9a063c5f73c4fd5efa5867ba767d4fdf4b0cf

tests/test.py

https://github.com/myheartsgoon/shadowsocksr

@@ -8,7 +8,7 @@ import select import time from subprocess import Popen, PIPE -sys.path.insert(0, '../') +sys.path.insert(0, './') if 'salsa20' in sys.argv[-1]: from shadowsocks import encrypt_salsa20

sys . path . insert ( 0 , '../' )

sys . path . insert ( 0 , './' )

CHANGE_STRING_LITERAL

[["Update", ["string:'../'", 3, 20, 3, 25], "'./'"]]

myheartsgoon/shadowsocksr@c1cf02cbea8ade829eb30eaa83e5b282bd31b32a

fix tests

shadowsocksr

c9b489b5e316bfb226582c990b262469c5645fb8

1e1b1adba98c66da48acaa663fe59a03a44db686

shadowsocks/encrypt.py

https://github.com/myheartsgoon/shadowsocksr

@@ -224,7 +224,7 @@ def encrypt_all(password, method, op, data): if method == 'salsa20-ctr': cipher = encrypt_salsa20.Salsa20Cipher(method, key, iv, op) elif method == 'rc4-sha256': - return encrypt_rc4_sha256.create_cipher(method, key, iv, op) + cipher = encrypt_rc4_sha256.create_cipher(method, key, iv, op) else: cipher = M2Crypto.EVP.Cipher(method.replace('-', '_'), key, iv, op, key_as_bytes=0, d='md5',

return encrypt_rc4_sha256 . create_cipher ( method , key , iv , op )

cipher = encrypt_rc4_sha256 . create_cipher ( method , key , iv , op )

SINGLE_STMT

[["Insert", ["block", 3, 13, 3, 73], ["expression_statement", "N0"], 0], ["Insert", "N0", ["assignment", "N1"], 0], ["Insert", "N1", ["identifier:cipher", "T"], 0], ["Insert", "N1", ["=:=", "T"], 1], ["Move", "N1", ["call", 3, 20, 3, 73], 2], ["Delete", ["return:return", 3, 13, 3, 19]], ["Delete", ["return_statement", 3, 13, 3, 73]]]

myheartsgoon/shadowsocksr@c9b489b5e316bfb226582c990b262469c5645fb8

fix UDP

shadowsocksr

f6951c963303e3ecfbb4194dafe94ad9400e2284

d6a5c567aebff58600d452469c9dcc8a681ab6fc

shadowsocks/crypto/m2.py

https://github.com/myheartsgoon/shadowsocksr

@@ -36,7 +36,7 @@ def create_cipher(alg, key, iv, op, key_as_bytes=0, d=None, salt=None, i=1, padding=1): import M2Crypto.EVP - return M2Crypto.EVP.Cipher('rc4', key, iv, op, key_as_bytes=0, + return M2Crypto.EVP.Cipher(alg.replace('-', '_'), key, iv, op, key_as_bytes=0, d='md5', salt=None, i=1, padding=1)

return M2Crypto . EVP . Cipher ( 'rc4' , key , iv , op , key_as_bytes = 0 , d = 'md5' , salt = None , i = 1 , padding = 1 )

return M2Crypto . EVP . Cipher ( alg . replace ( '-' , '_' ) , key , iv , op , key_as_bytes = 0 , d = 'md5' , salt = None , i = 1 , padding = 1 )

SINGLE_STMT

[["Insert", ["argument_list", 3, 31, 4, 67], ["call", "N0"], 1], ["Insert", ["argument_list", 3, 31, 4, 67], [",:,", "T"], 2], ["Insert", "N0", ["attribute", "N1"], 0], ["Insert", "N0", ["argument_list", "N2"], 1], ["Insert", "N1", ["identifier:alg", "T"], 0], ["Insert", "N1", [".:.", "T"], 1], ["Insert", "N1", ["identifier:replace", "T"], 2], ["Insert", "N2", ["(:(", "T"], 0], ["Insert", "N2", ["string:'-'", "T"], 1], ["Move", "N2", [",:,", 3, 37, 3, 38], 2], ["Insert", "N2", ["string:'_'", "T"], 3], ["Insert", "N2", ["):)", "T"], 4], ["Delete", ["string:'rc4'", 3, 32, 3, 37]]]

myheartsgoon/shadowsocksr@f6951c963303e3ecfbb4194dafe94ad9400e2284

fix m2

shadowsocksr

c668ddbc1b37338c73ece403dcf56fb02ed2aa88

f677c8152d6d399651f9f499ac7a8d487073309c

shadowsocks/utils.py

https://github.com/myheartsgoon/shadowsocksr

@@ -186,7 +186,7 @@ def get_config(is_local): if 'local_port' in config: config['local_port'] = int(config['local_port']) - if 'server_port' in config: + if 'server_port' in config and type(config['server_port']) != list: config['server_port'] = int(config['server_port']) logging.getLogger('').handlers = []

if 'server_port' in config : config [ 'server_port' ] = int ( config [ 'server_port' ] )

if 'server_port' in config and type ( config [ 'server_port' ] ) != list : config [ 'server_port' ] = int ( config [ 'server_port' ] )

MORE_SPECIFIC_IF

[["Insert", ["if_statement", 3, 5, 4, 59], ["boolean_operator", "N0"], 1], ["Move", "N0", ["comparison_operator", 3, 8, 3, 31], 0], ["Insert", "N0", ["and:and", "T"], 1], ["Insert", "N0", ["comparison_operator", "N1"], 2], ["Insert", "N1", ["call", "N2"], 0], ["Insert", "N1", ["!=:!=", "T"], 1], ["Insert", "N1", ["identifier:list", "T"], 2], ["Insert", "N2", ["identifier:type", "T"], 0], ["Insert", "N2", ["argument_list", "N3"], 1], ["Insert", "N3", ["(:(", "T"], 0], ["Insert", "N3", ["subscript", "N4"], 1], ["Insert", "N3", ["):)", "T"], 2], ["Insert", "N4", ["identifier:config", "T"], 0], ["Insert", "N4", ["[:[", "T"], 1], ["Insert", "N4", ["string:'server_port'", "T"], 2], ["Insert", "N4", ["]:]", "T"], 3]]

myheartsgoon/shadowsocksr@c668ddbc1b37338c73ece403dcf56fb02ed2aa88

fix multiple ports

shadowsocksr

be045f1687a36fcb16fcf682164df5edd970bfda

497524b3136498b41800024d0e1c65afe0bda0bd

shadowsocks/crypto/rc4_md5.py

https://github.com/myheartsgoon/shadowsocksr

@@ -47,7 +47,7 @@ def create_cipher(alg, key, iv, op, key_as_bytes=0, d=None, salt=None, d='md5', salt=None, i=1, padding=1) except: m2_not_found = True - import ctypes_openssl + from shadowsocks.crypto import ctypes_openssl return ctypes_openssl.CtypesCrypto('rc4', rc4_key, '', op)

import ctypes_openssl

from shadowsocks . crypto import ctypes_openssl

SINGLE_STMT

[["Insert", ["module", 0, 40, 7, 0], ["import_from_statement", "N0"], 3], ["Insert", "N0", ["from:from", "T"], 0], ["Insert", "N0", ["dotted_name", "N1"], 1], ["Move", "N0", ["import:import", 3, 5, 3, 11], 2], ["Move", "N0", ["dotted_name", 3, 12, 3, 26], 3], ["Insert", "N1", ["identifier:shadowsocks", "T"], 0], ["Insert", "N1", [".:.", "T"], 1], ["Insert", "N1", ["identifier:crypto", "T"], 2], ["Delete", ["import_statement", 3, 5, 3, 26]]]

myheartsgoon/shadowsocksr@be045f1687a36fcb16fcf682164df5edd970bfda

fix import

shadowsocksr

833c98e1149d883d0ebb5657e924c71ef58cbd63

4e083440353833763ab1153d501788b4e40e6402

shadowsocks/tcprelay.py

https://github.com/myheartsgoon/shadowsocksr

@@ -261,7 +261,7 @@ class TCPRelayHandler(object): if header_result is None: raise Exception('can not parse header') addrtype, remote_addr, remote_port, header_length = header_result - logging.info('connecting %s:%d' % (remote_addr, remote_port)) + logging.info('connecting %s:%d' % (remote_addr.decode('utf-8'), remote_port)) self._remote_address = (remote_addr, remote_port) # pause reading self._update_stream(STREAM_UP, WAIT_STATUS_WRITING)

logging . info ( 'connecting %s:%d' % ( remote_addr , remote_port ) )

logging . info ( 'connecting %s:%d' % ( remote_addr . decode ( 'utf-8' ) , remote_port ) )

ADD_METHOD_CALL

[["Insert", ["tuple", 3, 47, 3, 73], ["call", "N0"], 1], ["Insert", ["tuple", 3, 47, 3, 73], ["):)", "T"], 5], ["Insert", "N0", ["attribute", "N1"], 0], ["Insert", "N0", ["argument_list", "N2"], 1], ["Move", "N1", ["identifier:remote_addr", 3, 48, 3, 59], 0], ["Insert", "N1", [".:.", "T"], 1], ["Insert", "N1", ["identifier:decode", "T"], 2], ["Insert", "N2", ["(:(", "T"], 0], ["Insert", "N2", ["string:'utf-8'", "T"], 1], ["Move", "N2", ["):)", 3, 72, 3, 73], 2]]

myheartsgoon/shadowsocksr@833c98e1149d883d0ebb5657e924c71ef58cbd63

tcprelay.py: decode remote_addr to fix extra b'' in logging on python 3

shadowsocksr

fb27cf52a9a7b72ef8d3e3693623de43a477ebaf

22b87f6f16ed2f28d96403ff884e6c0d8b1debf3

shadowsocks/tcprelay.py

https://github.com/myheartsgoon/shadowsocksr

@@ -207,7 +207,7 @@ class TCPRelayHandler(object): self._create_remote_socket(self._chosen_server[0], self._chosen_server[1]) self._loop.add(remote_sock, eventloop.POLL_ERR) - data = ''.join(self._data_to_write_to_local) + data = b''.join(self._data_to_write_to_local) l = len(data) s = remote_sock.sendto(data, MSG_FASTOPEN, self._chosen_server) if s < l:

data = '' . join ( self . _data_to_write_to_local )

data = b'' . join ( self . _data_to_write_to_local )

CHANGE_STRING_LITERAL

[["Update", ["string:''", 3, 24, 3, 26], "b''"]]

myheartsgoon/shadowsocksr@fb27cf52a9a7b72ef8d3e3693623de43a477ebaf

Fix str/byte related TypeError in Python 3.4 Traceback (most recent call last): File "/usr/bin/sslocal", line 9, in <module> load_entry_point('shadowsocks==2.4', 'console_scripts', 'sslocal')() File "/usr/lib/python3.4/site-packages/shadowsocks/local.py", line 68, in main loop.run() File "/usr/lib/python3.4/site-packages/shadowsocks/eventloop.py", line 230, in run handler(events) File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 630, in _handle_events handler.handle_event(sock, event) File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 458, in handle_event self._on_local_read() File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 377, in _on_local_read self._handle_stage_reply(data) File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 212, in _handle_stage_reply s = remote_sock.sendto(data, MSG_FASTOPEN, self._chosen_server) TypeError: 'str' does not support the buffer interface

shadowsocksr

5209860db106b8956a67fb029b2e37ad85c663c6

f9ba6f7390bc7819e31983762fa43e9c86a8c720

shadowsocks/crypto/table.py

https://github.com/myheartsgoon/shadowsocksr

@@ -170,7 +170,7 @@ def test_encryption(): from shadowsocks.crypto import util cipher = TableCipher(b'table', b'test', b'', 1) - decipher = TableCipher(b'rc4-md5', b'test', b'', 0) + decipher = TableCipher(b'table', b'test', b'', 0) util.run_cipher(cipher, decipher)

decipher = TableCipher ( b'rc4-md5' , b'test' , b'' , 0 )

decipher = TableCipher ( b'table' , b'test' , b'' , 0 )

CHANGE_STRING_LITERAL

[["Update", ["string:b'rc4-md5'", 3, 28, 3, 38], "b'table'"]]

myheartsgoon/shadowsocksr@5209860db106b8956a67fb029b2e37ad85c663c6

fix cipher name in test

shadowsocksr

f43906006a08712316a07392405fa70929e8e32d

ea535c74b21144c769dd41e6ccba36498801db85

shadowsocks/tcprelay.py

https://github.com/myheartsgoon/shadowsocksr

@@ -407,7 +407,7 @@ class TCPRelayHandler(object): def _on_local_write(self): if self._data_to_write_to_local: - data = ''.join(self._data_to_write_to_local) + data = b''.join(self._data_to_write_to_local) self._data_to_write_to_local = [] self._write_to_sock(data, self._local_sock) else:

data = '' . join ( self . _data_to_write_to_local )

data = b'' . join ( self . _data_to_write_to_local )

CHANGE_STRING_LITERAL

[["Update", ["string:''", 3, 20, 3, 22], "b''"]]

myheartsgoon/shadowsocksr@f43906006a08712316a07392405fa70929e8e32d

fix str/byte issue in python 3

shadowsocksr

d91f7d85d4adcc91cf61a2211bd59588c7421f09

5a5158b33f24d012496060a6b6b9a061bc982ee4

shadowsocks/crypto/ctypes_libsodium.py

https://github.com/myheartsgoon/shadowsocksr

@@ -42,7 +42,7 @@ def load_libsodium(): global loaded, libsodium, buf from ctypes.util import find_library - for p in ('sodium',): + for p in ('sodium', 'libsodium'): libsodium_path = find_library(p) if libsodium_path: break

for p in ( 'sodium' , ) : libsodium_path = find_library ( p ) if libsodium_path : break

for p in ( 'sodium' , 'libsodium' ) : libsodium_path = find_library ( p ) if libsodium_path : break

ADD_ELEMENTS_TO_ITERABLE

[["Insert", ["tuple", 3, 14, 3, 25], ["string:'libsodium'", "T"], 3]]

myheartsgoon/shadowsocksr@d91f7d85d4adcc91cf61a2211bd59588c7421f09

Update ctypes_libsodium.py

shadowsocksr

5a5c8b9c7e6a3bdeec3be69554df654c05ffeca5

70559a1030fe88211a119057587580153792fd78

tests/coverage_server.py

https://github.com/myheartsgoon/shadowsocksr

@@ -18,7 +18,7 @@ if __name__ == '__main__': raise tornado.web.HTTPError(404) application = tornado.web.Application([ - (r"/([a-zA-Z0-9\\-_]+)", MainHandler), + (r"/([a-zA-Z0-9\-_]+)", MainHandler), ]) if __name__ == "__main__":

application = tornado . web . Application ( [ ( r"/([a-zA-Z0-9\\-_]+)" , MainHandler ) , ] )

application = tornado . web . Application ( [ ( r"/([a-zA-Z0-9\-_]+)" , MainHandler ) , ] )

CHANGE_STRING_LITERAL

[["Update", ["string:r\"/([a-zA-Z0-9\\\\-_]+)\"", 3, 10, 3, 32], "r\"/([a-zA-Z0-9\\-_]+)\""]]

myheartsgoon/shadowsocksr@5a5c8b9c7e6a3bdeec3be69554df654c05ffeca5

fix coverage server

shadowsocksr

8b2deb01d8967cd9afb70600cd0488c5fa34afee

b6efc0efd900d4a27d3805a0b5fd38aa1105474a

shadowsocks/utils.py

https://github.com/myheartsgoon/shadowsocksr

@@ -172,7 +172,7 @@ def get_config(is_local): sys.exit(2) config['password'] = config.get('password', '') - config['method'] = config.get('method', 'aes-256-cfb') + config['method'] = config.get('method', b'aes-256-cfb') config['port_password'] = config.get('port_password', None) config['timeout'] = int(config.get('timeout', 300)) config['fast_open'] = config.get('fast_open', False)

config [ 'method' ] = config . get ( 'method' , 'aes-256-cfb' )

config [ 'method' ] = config . get ( 'method' , b'aes-256-cfb' )

CHANGE_STRING_LITERAL

[["Update", ["string:'aes-256-cfb'", 3, 45, 3, 58], "b'aes-256-cfb'"]]

myheartsgoon/shadowsocksr@8b2deb01d8967cd9afb70600cd0488c5fa34afee

Set default method as bytes. Default method as string may cause false error report.

shadowsocksr

a0aa9173a8001b5c20e270d7b5dcec28172cfa3f

79b9b53dbea59627d43ec7ee4eb2dd54777460be

shadowsocks/common.py

https://github.com/myheartsgoon/shadowsocksr

@@ -192,7 +192,7 @@ class IPNetwork(object): self._network_list_v6 = [] if type(addrs) == str: addrs = addrs.split(',') - map(self.add_network, addrs) + list(map(self.add_network, addrs)) def add_network(self, addr): if addr is "":

map ( self . add_network , addrs )

list ( map ( self . add_network , addrs ) )

ADD_FUNCTION_AROUND_EXPRESSION

[["Insert", ["call", 3, 9, 3, 37], ["identifier:list", "T"], 0], ["Insert", ["call", 3, 9, 3, 37], ["argument_list", "N0"], 1], ["Insert", "N0", ["(:(", "T"], 0], ["Move", "N0", ["call", 3, 9, 3, 37], 1], ["Insert", "N0", ["):)", "T"], 2]]

myheartsgoon/shadowsocksr@a0aa9173a8001b5c20e270d7b5dcec28172cfa3f

Fix for Python3 map changed behavior In Python3, map returns an iterator instead of list in Python2, which cause map "lazier" than before, wrap with list() force it running.

shadowsocksr

07dc98f60d7d09f3cfff7a21a67b268f96ce49ad

99db626225508c205f6b8e5982224cd9e28443e7

shadowsocks/tcprelay.py

https://github.com/myheartsgoon/shadowsocksr

@@ -209,7 +209,7 @@ class TCPRelayHandler(object): if addrs: af, socktype, proto, canonname, server_addr = addrs[0] data = data[header_length:] - sock.sendto(data, server_addr) + sock.sendto(data, (server_addr[0], dest_port)) except Exception as e: trace = traceback.format_exc()

sock . sendto ( data , server_addr )

sock . sendto ( data , ( server_addr [ 0 ] , dest_port ) )

SINGLE_STMT

[["Insert", ["argument_list", 3, 32, 3, 51], ["tuple", "N0"], 3], ["Insert", ["argument_list", 3, 32, 3, 51], ["):)", "T"], 4], ["Insert", "N0", ["(:(", "T"], 0], ["Insert", "N0", ["subscript", "N1"], 1], ["Insert", "N0", [",:,", "T"], 2], ["Insert", "N0", ["identifier:dest_port", "T"], 3], ["Move", "N0", ["):)", 3, 50, 3, 51], 4], ["Move", "N1", ["identifier:server_addr", 3, 39, 3, 50], 0], ["Insert", "N1", ["[:[", "T"], 1], ["Insert", "N1", ["integer:0", "T"], 2], ["Insert", "N1", ["]:]", "T"], 3]]

myheartsgoon/shadowsocksr@07dc98f60d7d09f3cfff7a21a67b268f96ce49ad

udp fix sendto argv

bookmark-server

4c7db13d97ecf1eb6aa606ced345d444bb765dae

41539361757edb0c41887f38a4838fa447347633

BookmarkServer.py

https://github.com/SDey96/bookmark-server

@@ -110,5 +110,5 @@ class Shortener(http.server.BaseHTTPRequestHandler): if __name__ == '__main__': port = int(os.environ.get('PORT', 8000)) # Use PORT if it's there. server_address = ('', port) - httpd = HTTPServer(server_address, Shortener) + httpd = http.server.HTTPServer(server_address, Shortener) httpd.serve_forever()

httpd = HTTPServer ( server_address , Shortener )

httpd = http . server . HTTPServer ( server_address , Shortener )

SINGLE_STMT

[["Insert", ["call", 3, 13, 3, 50], ["attribute", "N0"], 0], ["Insert", "N0", ["attribute", "N1"], 0], ["Insert", "N0", [".:.", "T"], 1], ["Move", "N0", ["identifier:HTTPServer", 3, 13, 3, 23], 2], ["Insert", "N1", ["identifier:http", "T"], 0], ["Insert", "N1", [".:.", "T"], 1], ["Insert", "N1", ["identifier:server", "T"], 2]]

SDey96/bookmark-server@4c7db13d97ecf1eb6aa606ced345d444bb765dae

vHackOSBot-Python

bda9612510b49d4d82f4b1f4c7e37db849713a5c

c4a557907f13276328a8c4c8a71ef27cd3143e2f

network.py

https://github.com/vHackUser/vHackOSBot-Python

@@ -55,7 +55,7 @@ class Network(): self.targetHack = self.ut.requestString("exploit.php", lang="fr", target=str(targetNetwork["ip"]), accesstoken=self.Configuration["accessToken"]) if self.targetHack["result"] == "0": self.targetHack = self.ut.requestString("remote.php", lang="fr", target=str(targetNetwork["ip"]), accesstoken=self.Configuration["accessToken"]) - self.getBanking(self, targetNetwork) + self.getBanking(targetNetwork) elif self.targetHack["result"] == "2": self.ut.viewsPrint("showMsgErrorSdk=0", "[{}] - don't possible to hack sdk exploit = 0 wait.".format(os.path.basename(os.path.basename(__file__)))) time.sleep(0.8)

self . getBanking ( self , targetNetwork )

self . getBanking ( targetNetwork )

SAME_FUNCTION_LESS_ARGS

[["Delete", ["identifier:self", 3, 37, 3, 41]], ["Delete", [",:,", 3, 41, 3, 42]]]

vHackUser/vHackOSBot-Python@bda9612510b49d4d82f4b1f4c7e37db849713a5c

fix minor error in self.getBanking

electrumx

751bb2d970c0ada6180dcf329a86385c1fd55e00

5624809933bdf5467e7e755e01ad6cfdc1d9541a

server/protocol.py

https://github.com/Fair-Exchange/electrumx

@@ -43,7 +43,7 @@ class BlockServer(BlockProcessor): self.irc = IRC(env) async def caught_up(self, mempool_hashes): - await super().caught_up([]) #mempool_hashes) + await super().caught_up(mempool_hashes) if not self.servers: await self.start_servers() if self.env.irc:

await super ( ) . caught_up ( [ ] )

await super ( ) . caught_up ( mempool_hashes )

SINGLE_STMT

[["Insert", ["argument_list", 3, 32, 3, 36], ["identifier:mempool_hashes", "T"], 1], ["Delete", ["[:[", 3, 33, 3, 34]], ["Delete", ["]:]", 3, 34, 3, 35]], ["Delete", ["list", 3, 33, 3, 35]]]

Fair-Exchange/electrumx@751bb2d970c0ada6180dcf329a86385c1fd55e00

Remove debug code

visbrain

bd3fb27d1b45de51367ebaedbc286aca446eb597

1dca8c9635fa92b339e336ada7e49f1d5efa1a5c

examples/5_RealDataExample.py

https://github.com/kdeleeuw11/visbrain

@@ -9,5 +9,5 @@ data = np.load('RealDataExample.npz') s_data = data['beta'] s_xyz = data['xyz'] -vb = vbrain(s_xyz=s_xyz, s_data=s_data) +vb = vbrain(s_xyz=s_xyz, s_data=s_data, cmap_vmin=-1, cmap_vmax=1, cmap='jet') vb.show() \ No newline at end of file

vb = vbrain ( s_xyz = s_xyz , s_data = s_data )

vb = vbrain ( s_xyz = s_xyz , s_data = s_data , cmap_vmin = - 1 , cmap_vmax = 1 , cmap = 'jet' )

SAME_FUNCTION_MORE_ARGS

[["Insert", ["argument_list", 3, 12, 3, 40], [",:,", "T"], 4], ["Insert", ["argument_list", 3, 12, 3, 40], ["keyword_argument", "N0"], 5], ["Insert", ["argument_list", 3, 12, 3, 40], [",:,", "T"], 6], ["Insert", ["argument_list", 3, 12, 3, 40], ["keyword_argument", "N1"], 7], ["Insert", ["argument_list", 3, 12, 3, 40], [",:,", "T"], 8], ["Insert", ["argument_list", 3, 12, 3, 40], ["keyword_argument", "N2"], 9], ["Insert", "N0", ["identifier:cmap_vmin", "T"], 0], ["Insert", "N0", ["=:=", "T"], 1], ["Insert", "N0", ["unary_operator", "N3"], 2], ["Insert", "N1", ["identifier:cmap_vmax", "T"], 0], ["Insert", "N1", ["=:=", "T"], 1], ["Insert", "N1", ["integer:1", "T"], 2], ["Insert", "N2", ["identifier:cmap", "T"], 0], ["Insert", "N2", ["=:=", "T"], 1], ["Insert", "N2", ["string:'jet'", "T"], 2], ["Insert", "N3", ["-:-", "T"], 0], ["Insert", "N3", ["integer:1", "T"], 1]]

kdeleeuw11/visbrain@bd3fb27d1b45de51367ebaedbc286aca446eb597

Fix colorbar for the example

visbrain

f3520ac9cb0184bfd8118b9c555eef5ae9514854

75b39a91724aeca7512799916ad3539898c832fa

vbrain/elements/AtlasBase.py

https://github.com/kdeleeuw11/visbrain

@@ -16,7 +16,7 @@ class AtlasBase(object): """ """ - def __init__(self, a_color=(1.0,1.0,1.0), a_opacity=0.1, a_projection='internal', a_template='B1', + def __init__(self, a_color=(1.0,1.0,1.0), a_opacity=1., a_projection='internal', a_template='B1', a_vertices=None, a_faces=None, a_shading='smooth', a_transform=[], l_position=(100., 100., 100.), l_intensity=(1., 1., 1.), l_color=(1., 1., 1., 1.), l_coefAmbient=0.05, l_coefSpecular=0.5, **kwargs): # Get inputs :

def __init__ ( self , a_color = ( 1.0 , 1.0 , 1.0 ) , a_opacity = 0.1 , a_projection = 'internal' , a_template = 'B1' , a_vertices = None , a_faces = None , a_shading = 'smooth' , a_transform = [ ] , l_position = ( 100. , 100. , 100. ) , l_intensity = ( 1. , 1. , 1. ) , l_color = ( 1. , 1. , 1. , 1. ) , l_coefAmbient = 0.05 , l_coefSpecular = 0.5 , ** kwargs ) :

def __init__ ( self , a_color = ( 1.0 , 1.0 , 1.0 ) , a_opacity = 1. , a_projection = 'internal' , a_template = 'B1' , a_vertices = None , a_faces = None , a_shading = 'smooth' , a_transform = [ ] , l_position = ( 100. , 100. , 100. ) , l_intensity = ( 1. , 1. , 1. ) , l_color = ( 1. , 1. , 1. , 1. ) , l_coefAmbient = 0.05 , l_coefSpecular = 0.5 , ** kwargs ) :

CHANGE_NUMERIC_LITERAL

[["Update", ["float:0.1", 3, 57, 3, 60], "1."]]

kdeleeuw11/visbrain@f3520ac9cb0184bfd8118b9c555eef5ae9514854

Default opacity is 1

visbrain

9f5a0c65f6ae768c8593467ecf3655db8168dc09

a3ebd0bdceb5e87ae4a0ec9b75bf5e85644857bc

vbrain/interface/uiElements/uiSettings.py

https://github.com/kdeleeuw11/visbrain

@@ -79,7 +79,7 @@ class uiSettings(object): img = self.view.canvas.render() io.imsave(filename, img, format='tiff') - if self.cbexport: + if self.cb['export']: cbimg = self.view.cbcanvas.render() if filename.find('.')+1: filename = filename.replace('.', '_colorbar.')

if self . cbexport : cbimg = self . view . cbcanvas . render ( ) if filename . find ( '.' ) + 1 : filename = filename . replace ( '.' , '_colorbar.' )

if self . cb [ 'export' ] : cbimg = self . view . cbcanvas . render ( ) if filename . find ( '.' ) + 1 : filename = filename . replace ( '.' , '_colorbar.' )

SINGLE_STMT

[["Insert", ["if_statement", 3, 9, 6, 63], ["subscript", "N0"], 1], ["Move", "N0", ["attribute", 3, 12, 3, 25], 0], ["Insert", "N0", ["[:[", "T"], 1], ["Insert", "N0", ["string:'export'", "T"], 2], ["Insert", "N0", ["]:]", "T"], 3], ["Update", ["identifier:cbexport", 3, 17, 3, 25], "cb"]]

kdeleeuw11/visbrain@9f5a0c65f6ae768c8593467ecf3655db8168dc09

Fix exportation

visbrain

cd936c29048deceb9aa995bfc4f2eaddce4b536f

12d30fe30840d9cc2f46a1cc4edcb111f7783fc5

setup.py

https://github.com/kdeleeuw11/visbrain

@@ -39,7 +39,7 @@ setup( long_description=open("README.md").read(), author=AUTHOR, author_email=AUTHOR_EMAIL, - install_requires=["numpy", "vispy", "PyQt4", "matplotlib"], + install_requires=["numpy", "vispy", "pyqt", "matplotlib"], maintainer=AUTHOR, maintainer_email=AUTHOR_EMAIL, license='LICENSE.txt',

install_requires = [ "numpy" , "vispy" , "PyQt4" , "matplotlib" ] ,

install_requires = [ "numpy" , "vispy" , "pyqt" , "matplotlib" ] ,

CHANGE_STRING_LITERAL

[["Update", ["string:\"PyQt4\"", 3, 41, 3, 48], "\"pyqt\""]]

kdeleeuw11/visbrain@cd936c29048deceb9aa995bfc4f2eaddce4b536f

Fix pyqt

visbrain

9be230588ff85062a804d1dc8b75dabb46458505

042ce2f50df080bbe92b8fb964c2c686abdc5a79

setup.py

https://github.com/kdeleeuw11/visbrain

@@ -39,7 +39,7 @@ setup( long_description=open("README.md").read(), author=AUTHOR, author_email=AUTHOR_EMAIL, - install_requires=["numpy", "vispy", "pyqt", "matplotlib"], + install_requires=["numpy", "vispy", "matplotlib"], maintainer=AUTHOR, maintainer_email=AUTHOR_EMAIL, license='LICENSE.txt',

install_requires = [ "numpy" , "vispy" , "pyqt" , "matplotlib" ] ,

install_requires = [ "numpy" , "vispy" , "matplotlib" ] ,

SINGLE_STMT

[["Delete", ["string:\"pyqt\"", 3, 41, 3, 47]], ["Delete", [",:,", 3, 47, 3, 48]]]

kdeleeuw11/visbrain@9be230588ff85062a804d1dc8b75dabb46458505

Fix pyqt

visbrain

4bce00a79d2d3fe3f31ae21078601d3752669d8c

829a8aa0fa89ac8aa39e172bfb44bbd6918a201a

docs/conf.py

https://github.com/kdeleeuw11/visbrain

@@ -116,7 +116,7 @@ todo_include_todos = False # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'alabaster' +html_theme = 'default' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the

html_theme = 'alabaster'

html_theme = 'default'

CHANGE_STRING_LITERAL

[["Update", ["string:'alabaster'", 3, 14, 3, 25], "'default'"]]

kdeleeuw11/visbrain@4bce00a79d2d3fe3f31ae21078601d3752669d8c

Update conf.py Set default theme

visbrain

a5f3457667317a18a49c60352134d67db4e74131

bc2a290898e91db9ca02e28be912574478788cf6

docs/conf.py

https://github.com/kdeleeuw11/visbrain

@@ -116,7 +116,7 @@ todo_include_todos = False # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'classic' +html_theme = 'default' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the

html_theme = 'classic'

html_theme = 'default'

CHANGE_STRING_LITERAL

[["Update", ["string:'classic'", 3, 14, 3, 23], "'default'"]]

kdeleeuw11/visbrain@a5f3457667317a18a49c60352134d67db4e74131

Update conf.py Back to default

visbrain

2b9b7c2f1eb5b6eaee28ceb42f80ea5b15ee8148

64cea58740c8504200fd0fa2d665a2d1b94e6975

visbrain/sleep/sleep.py

https://github.com/kdeleeuw11/visbrain

@@ -21,7 +21,7 @@ class Sleep(uiInit, visuals, uiElements, Tools): - def __init__(self, file=None, hypno_file=None, data=None, channels=None, + def __init__(self, file='', hypno_file=None, data=None, channels=None, sf=None, hypno=None, downsample=200, axis=False, line='gl'): """Init.""" # ====================== APP CREATION ======================

def __init__ ( self , file = None , hypno_file = None , data = None , channels = None , sf = None , hypno = None , downsample = 200 , axis = False , line = 'gl' ) : """Init."""

def __init__ ( self , file = '' , hypno_file = None , data = None , channels = None , sf = None , hypno = None , downsample = 200 , axis = False , line = 'gl' ) : """Init."""

SINGLE_TOKEN

[["Insert", ["default_parameter", 1, 24, 1, 33], ["string:''", "T"], 2], ["Delete", ["none:None", 1, 29, 1, 33]]]

kdeleeuw11/visbrain@2b9b7c2f1eb5b6eaee28ceb42f80ea5b15ee8148

fixed bug sleep stats filename

visbrain

eaad974e2cc43688f5828356ede978b6b99ea6ec

d79af9680238ca1b906688d11ea1d6517e40b75c

visbrain/sleep/interface/uiElements/uiInfo.py

https://github.com/kdeleeuw11/visbrain

@@ -24,7 +24,7 @@ class uiInfo(object): """Complete the table sleep info.""" # Get sleep info : win = self._infoTime.value() - stats = sleepstats(self._file, self._hyp.mesh.pos[:, 1], self._sf, win) + stats = sleepstats(self._file, -self._hyp.mesh.pos[:, 1], self._sf, win) self._keysInfo = ['Window'] + [''] * len(stats) self._valInfo = [str(win)] + [''] * len(stats) # Check line number:

stats = sleepstats ( self . _file , self . _hyp . mesh . pos [ : , 1 ] , self . _sf , win )

stats = sleepstats ( self . _file , - self . _hyp . mesh . pos [ : , 1 ] , self . _sf , win )

CHANGE_UNARY_OPERATOR

[["Insert", ["argument_list", 3, 27, 3, 80], ["unary_operator", "N0"], 3], ["Insert", "N0", ["-:-", "T"], 0], ["Move", "N0", ["subscript", 3, 40, 3, 64], 1]]

kdeleeuw11/visbrain@eaad974e2cc43688f5828356ede978b6b99ea6ec

Fix uiInfo

visbrain

c7d7b0641b63165d060e1b707ad3d40b5c1ea3be

eaad974e2cc43688f5828356ede978b6b99ea6ec

visbrain/sleep/visuals/visuals.py

https://github.com/kdeleeuw11/visbrain

@@ -234,7 +234,7 @@ class Spectrogram(object): # Update object : self.mesh.update() # Get camera rectangle : - self.rect = (t.min(), freq.min(), t.max()-t.min(), + self.rect = (time.min(), freq.min(), time.max()-time.min(), freq.max()-freq.min()) self.freq = freq

self . rect = ( t . min ( ) , freq . min ( ) , t . max ( ) - t . min ( ) , freq . max ( ) - freq . min ( ) )

self . rect = ( time . min ( ) , freq . min ( ) , time . max ( ) - time . min ( ) , freq . max ( ) - freq . min ( ) )

SINGLE_STMT

[["Update", ["identifier:t", 3, 22, 3, 23], "time"], ["Move", ["call", 3, 43, 3, 50], ["argument_list", 3, 56, 3, 58], 1], ["Insert", ["call", 3, 51, 3, 58], ["argument_list", "N0"], 1], ["Update", ["identifier:t", 3, 43, 3, 44], "time"], ["Update", ["identifier:t", 3, 51, 3, 52], "time"], ["Insert", "N0", ["(:(", "T"], 0], ["Insert", "N0", ["):)", "T"], 1], ["Delete", ["(:(", 3, 48, 3, 49]], ["Delete", ["):)", 3, 49, 3, 50]], ["Delete", ["argument_list", 3, 48, 3, 50]]]

kdeleeuw11/visbrain@c7d7b0641b63165d060e1b707ad3d40b5c1ea3be

Fix spectrogram time axis

visbrain

31b8fbaebdaf3baf349b777c1f975e0160d8dbe0

82d053e0830ff19344cbe09c2bb8788235d51e59

visbrain/sleep/interface/uiElements/uiTools.py

https://github.com/kdeleeuw11/visbrain

@@ -105,6 +105,6 @@ class uiTools(object): # Run detection : self._fcn_applyDetection() # Update progress bar : - self._ToolDetectProgress.setValue(100. * k / len(self)) + self._ToolDetectProgress.setValue(100. * (k + 1) / len(self)) # Finally, hide progress bar : self._ToolDetectProgress.hide()

self . _ToolDetectProgress . setValue ( 100. * k / len ( self ) )

self . _ToolDetectProgress . setValue ( 100. * ( k + 1 ) / len ( self ) )

CHANGE_BINARY_OPERAND

[["Insert", ["binary_operator", 3, 47, 3, 55], ["parenthesized_expression", "N0"], 2], ["Insert", "N0", ["(:(", "T"], 0], ["Insert", "N0", ["binary_operator", "N1"], 1], ["Insert", "N0", ["):)", "T"], 2], ["Move", "N1", ["identifier:k", 3, 54, 3, 55], 0], ["Insert", "N1", ["+:+", "T"], 1], ["Insert", "N1", ["integer:1", "T"], 2]]

kdeleeuw11/visbrain@31b8fbaebdaf3baf349b777c1f975e0160d8dbe0

Fix progress bar counting

visbrain

735084eefb3bb54207926b090fec4476b1fc2c28

bda90086daff51b2fc0158ddfdd4a350533da021

visbrain/sleep/interface/uiElements/uiInfo.py

https://github.com/kdeleeuw11/visbrain

@@ -46,7 +46,7 @@ class uiInfo(object): """Export stat info.""" # Get file name : path = QtGui.QFileDialog.getSaveFileName( - self, "Save File", "", + self, "Save File", "statsinfo.csv", filter="CSV Files (*.csv);;Text Files (*.txt)") # Find extension : selected_ext = self._infoExportAs.currentText()

path = QtGui . QFileDialog . getSaveFileName ( self , "Save File" , "" , filter = "CSV Files (*.csv);;Text Files (*.txt)" )

path = QtGui . QFileDialog . getSaveFileName ( self , "Save File" , "statsinfo.csv" , filter = "CSV Files (*.csv);;Text Files (*.txt)" )

CHANGE_STRING_LITERAL

[["Update", ["string:\"\"", 3, 32, 3, 34], "\"statsinfo.csv\""]]

kdeleeuw11/visbrain@735084eefb3bb54207926b090fec4476b1fc2c28

Configure default save hypno name

electrumx

e4c206e123b40decc93506217c22d9d007d43e80

8bc9abf9c1dcbb758b27c709a6a4cd30049c99b1

lib/jsonrpc.py

https://github.com/Fair-Exchange/electrumx

@@ -607,7 +607,7 @@ class JSONSessionBase(util.LoggedClass): if self.version.HAS_BATCHES: parts = [self.notification_bytes(*pair) for pair in mp_iterable] - self.send_binary(batch_bytes(parts)) + self.send_binary(self.version.batch_bytes(parts)) else: for pair in mp_iterable: self.send_notification(*pair)

self . send_binary ( batch_bytes ( parts ) )

self . send_binary ( self . version . batch_bytes ( parts ) )

SINGLE_STMT

[["Insert", ["call", 2, 30, 2, 48], ["attribute", "N0"], 0], ["Insert", "N0", ["attribute", "N1"], 0], ["Insert", "N0", [".:.", "T"], 1], ["Move", "N0", ["identifier:batch_bytes", 2, 30, 2, 41], 2], ["Insert", "N1", ["identifier:self", "T"], 0], ["Insert", "N1", [".:.", "T"], 1], ["Insert", "N1", ["identifier:version", "T"], 2]]

Fair-Exchange/electrumx@e4c206e123b40decc93506217c22d9d007d43e80

Namespace fix

electrumx

4dcd7f25a500a00d1a1e4ae59aba8fba83dd4dd5

09b2df11797b7e1cdd6aee66461ec946cf2f359a

lib/coins.py

https://github.com/Fair-Exchange/electrumx

@@ -34,7 +34,7 @@ class Coin(object): REORG_LIMIT = 200 # Not sure if these are coin-specific - RPC_URL_REGEX = re.compile('.+@(\[[0-9:]+\]|[^:]+)(:[0-9]+)?') + RPC_URL_REGEX = re.compile('.+@(\[[0-9a-fA-F:]+\]|[^:]+)(:[0-9]+)?') VALUE_PER_COIN = 100000000 CHUNK_SIZE = 2016 IRC_SERVER = "irc.freenode.net"

RPC_URL_REGEX = re . compile ( '.+@(\[[0-9:]+\]|[^:]+)(:[0-9]+)?' )

RPC_URL_REGEX = re . compile ( '.+@(\[[0-9a-fA-F:]+\]|[^:]+)(:[0-9]+)?' )

CHANGE_STRING_LITERAL

[["Update", ["string:'.+@(\\[[0-9:]+\\]|[^:]+)(:[0-9]+)?'", 3, 32, 3, 66], "'.+@(\\[[0-9a-fA-F:]+\\]|[^:]+)(:[0-9]+)?'"]]

Fair-Exchange/electrumx@4dcd7f25a500a00d1a1e4ae59aba8fba83dd4dd5

Further fix regex for hex chars

electrumx

012233672ab9c76d2916af3fba659e9a18f8e1c1

6f32f99a067b1bf677ada1b68eed92d59ada7846

server/peers.py

https://github.com/Fair-Exchange/electrumx

@@ -440,7 +440,7 @@ class PeerManager(util.LoggedClass): def retry_peer(peer): # Try some Tor at startup to determine the proxy so we can # serve the right banner file - if self.last_tor_retry_time == 0 and self.is_coin_onion_peer(peer): + if self.tor_proxy.port is None and self.is_coin_onion_peer(peer): return True # Retry a peer whose ports might have updated if peer.other_port_pairs:

if self . last_tor_retry_time == 0 and self . is_coin_onion_peer ( peer ) : return True

if self . tor_proxy . port is None and self . is_coin_onion_peer ( peer ) : return True

CHANGE_BINARY_OPERAND

[["Insert", ["comparison_operator", 3, 16, 3, 45], ["attribute", "N0"], 0], ["Insert", ["comparison_operator", 3, 16, 3, 45], ["is:is", "T"], 1], ["Insert", ["comparison_operator", 3, 16, 3, 45], ["none:None", "T"], 2], ["Move", "N0", ["attribute", 3, 16, 3, 40], 0], ["Insert", "N0", [".:.", "T"], 1], ["Insert", "N0", ["identifier:port", "T"], 2], ["Update", ["identifier:last_tor_retry_time", 3, 21, 3, 40], "tor_proxy"], ["Delete", ["==:==", 3, 41, 3, 43]], ["Delete", ["integer:0", 3, 44, 3, 45]]]

Fair-Exchange/electrumx@012233672ab9c76d2916af3fba659e9a18f8e1c1

fix tor coin peers always scheduled for check (#139) fixes #138

electrumx

4c8b5a643991080d19a94a64887337721ad6d8fe

5bcbdea16a7681a4470a1c0cae3856e0d4e45b8b

server/peers.py

https://github.com/Fair-Exchange/electrumx

@@ -439,7 +439,7 @@ class PeerManager(util.LoggedClass): def retry_peer(peer): # Try some Tor at startup to determine the proxy so we can # serve the right banner file - if self.last_tor_retry_time == 0 and self.is_coin_onion_peer(peer): + if self.tor_proxy.port is None and self.is_coin_onion_peer(peer): return True # Retry a peer whose ports might have updated if peer.other_port_pairs:

if self . last_tor_retry_time == 0 and self . is_coin_onion_peer ( peer ) : return True

if self . tor_proxy . port is None and self . is_coin_onion_peer ( peer ) : return True

CHANGE_BINARY_OPERAND

[["Insert", ["comparison_operator", 3, 16, 3, 45], ["attribute", "N0"], 0], ["Insert", ["comparison_operator", 3, 16, 3, 45], ["is:is", "T"], 1], ["Insert", ["comparison_operator", 3, 16, 3, 45], ["none:None", "T"], 2], ["Move", "N0", ["attribute", 3, 16, 3, 40], 0], ["Insert", "N0", [".:.", "T"], 1], ["Insert", "N0", ["identifier:port", "T"], 2], ["Update", ["identifier:last_tor_retry_time", 3, 21, 3, 40], "tor_proxy"], ["Delete", ["==:==", 3, 41, 3, 43]], ["Delete", ["integer:0", 3, 44, 3, 45]]]

Fair-Exchange/electrumx@4c8b5a643991080d19a94a64887337721ad6d8fe

fix tor coin peers always scheduled for check (#139) fixes #138

electrumx

b3005fbb3ecb7add25bbc76dc68daf8c60a40c87

a2c5ecf0a0a5f87f264bdd2f92a7d8238fb7d42f

server/session.py

https://github.com/Fair-Exchange/electrumx

@@ -275,7 +275,7 @@ class ElectrumX(SessionBase): msg = ('chunk indices not advancing (wrong network?): {}' .format(self.chunk_indices)) # INVALID_REQUEST triggers a disconnect - raise RPCError(mrg, JSONRPC.INVALID_REQUEST) + raise RPCError(msg, JSONRPC.INVALID_REQUEST) return self.controller.get_chunk(index) def is_tor(self):

raise RPCError ( mrg , JSONRPC . INVALID_REQUEST )

raise RPCError ( msg , JSONRPC . INVALID_REQUEST )

CHANGE_IDENTIFIER_USED

[["Update", ["identifier:mrg", 3, 28, 3, 31], "msg"]]

Fair-Exchange/electrumx@b3005fbb3ecb7add25bbc76dc68daf8c60a40c87

Fix typo

electrumx

472c7384792b57a476ab897535600722c9528991

b3005fbb3ecb7add25bbc76dc68daf8c60a40c87

server/irc.py

https://github.com/Fair-Exchange/electrumx

@@ -35,7 +35,7 @@ class IRC(LoggedClass): self.prefix = env.coin.IRC_PREFIX self.nick = '{}{}'.format(self.prefix, env.irc_nick if env.irc_nick else - double_sha256(env.identity.host.encode()) + double_sha256(env.host.encode()) [:5].hex()) self.peer_regexp = re.compile('({}[^!]*)!'.format(self.prefix))

self . nick = '{}{}' . format ( self . prefix , env . irc_nick if env . irc_nick else double_sha256 ( env . identity . host . encode ( ) ) [ : 5 ] . hex ( ) )

self . nick = '{}{}' . format ( self . prefix , env . irc_nick if env . irc_nick else double_sha256 ( env . host . encode ( ) ) [ : 5 ] . hex ( ) )

SINGLE_STMT

[["Delete", ["identifier:identity", 3, 53, 3, 61]], ["Delete", [".:.", 3, 61, 3, 62]]]

Fair-Exchange/electrumx@472c7384792b57a476ab897535600722c9528991

fix crash in IRC initialization (#141)

electrumx

d198b95798f51e048d3452b0244009b6abe72532

9238fe397d921dd8107575754fe1c421cbd24df6

server/peers.py

https://github.com/Fair-Exchange/electrumx

@@ -273,7 +273,7 @@ class PeerManager(util.LoggedClass): return [peer_data(peer) for peer in sorted(self.peers, key=peer_key)] - def add_peers(self, peers, limit=3, check_ports=False, source=None): + def add_peers(self, peers, limit=2, check_ports=False, source=None): '''Add a limited number of peers that are not already present.''' retry = False new_peers = []

def add_peers ( self , peers , limit = 3 , check_ports = False , source = None ) : '''Add a limited number of peers that are not already present.''' retry = False new_peers = [ ]

def add_peers ( self , peers , limit = 2 , check_ports = False , source = None ) : '''Add a limited number of peers that are not already present.''' retry = False new_peers = [ ]

CHANGE_NUMERIC_LITERAL

[["Update", ["integer:3", 3, 38, 3, 39], "2"]]

Fair-Exchange/electrumx@d198b95798f51e048d3452b0244009b6abe72532

Reduce new peers per source limit to 2 by default

electrumx

79bce5335e952d58d03911df94907af377de89c0

fa1a5bd3e4e4771f0e239ed58be93a16f69c44cf

server/peers.py

https://github.com/Fair-Exchange/electrumx

@@ -177,7 +177,7 @@ class PeerSession(JSONSession): def close_if_done(self): if not self.has_pending_requests(): if self.bad: - peer.mark_bad() + self.peer.mark_bad() self.peer_mgr.set_connection_status(self.peer, not self.bad) if self.peer.is_tor: how = 'via {} over Tor'.format(self.kind)

peer . mark_bad ( )

self . peer . mark_bad ( )

SINGLE_STMT

[["Insert", ["attribute", 3, 17, 3, 30], ["attribute", "N0"], 0], ["Insert", ["attribute", 3, 17, 3, 30], [".:.", "T"], 1], ["Insert", "N0", ["identifier:self", "T"], 0], ["Move", "N0", [".:.", 3, 21, 3, 22], 1], ["Move", "N0", ["identifier:peer", 3, 17, 3, 21], 2]]

Fair-Exchange/electrumx@79bce5335e952d58d03911df94907af377de89c0

Fix missing self

electrumx

321315ace07f569263711de207b19a0926492962

d1894356d0c806eaa8a81b223067c496e7a0c966

server/env.py

https://github.com/Fair-Exchange/electrumx

@@ -143,7 +143,7 @@ class Env(LoggedClass): host = self.default('REPORT_HOST_TOR', None) if host is None: return None - if not tor_host.endswith('.onion'): + if not host.endswith('.onion'): raise self.Error('tor host "{}" must end with ".onion"' .format(host))

if not tor_host . endswith ( '.onion' ) : raise self . Error ( 'tor host "{}" must end with ".onion"' . format ( host ) )

if not host . endswith ( '.onion' ) : raise self . Error ( 'tor host "{}" must end with ".onion"' . format ( host ) )

SAME_FUNCTION_WRONG_CALLER

[["Update", ["identifier:tor_host", 3, 16, 3, 24], "host"]]

Fair-Exchange/electrumx@321315ace07f569263711de207b19a0926492962

Fix typo

electrumx

08dbbf217a0f656dd7b0a7369087aa6896078e0d

d3348fe6841ad64b86dc7c8ba54006fe0cc91e56

server/session.py

https://github.com/Fair-Exchange/electrumx

@@ -34,7 +34,7 @@ class SessionBase(JSONSession): self.env = controller.env self.daemon = self.bp.daemon self.client = 'unknown' - self.client_version = (1) + self.client_version = (1, ) self.protocol_version = '1.0' self.anon_logs = self.env.anon_logs self.last_delay = 0

self . client_version = ( 1 )

self . client_version = ( 1 , )

SINGLE_STMT

[["Insert", ["assignment", 3, 9, 3, 34], ["tuple", "N0"], 2], ["Move", "N0", ["(:(", 3, 31, 3, 32], 0], ["Move", "N0", ["integer:1", 3, 32, 3, 33], 1], ["Insert", "N0", [",:,", "T"], 2], ["Move", "N0", ["):)", 3, 33, 3, 34], 3], ["Delete", ["parenthesized_expression", 3, 31, 3, 34]]]

Fair-Exchange/electrumx@08dbbf217a0f656dd7b0a7369087aa6896078e0d

client_version must be a tuple Fixes #180

electrumx

9a9f78030d9b9308dac7a7032da442b51a61b657

efd859ab0288f210981ed712831d457a458f17cd

electrumx_server.py

https://github.com/Fair-Exchange/electrumx

@@ -33,7 +33,7 @@ def main_loop(): raise RuntimeError('Python >= 3.5.3 is required to run ElectrumX') if os.geteuid() == 0: - raise RuntimeError('DO NOT RUN AS ROOT! Create an unpriveleged user ' + raise RuntimeError('DO NOT RUN AS ROOT! Create an unprivileged user ' 'account and use that') loop = asyncio.get_event_loop()

raise RuntimeError ( 'DO NOT RUN AS ROOT! Create an unpriveleged user ' 'account and use that' )

raise RuntimeError ( 'DO NOT RUN AS ROOT! Create an unprivileged user ' 'account and use that' )

CHANGE_STRING_LITERAL

[["Update", ["string:'DO NOT RUN AS ROOT! Create an unpriveleged user '", 3, 28, 3, 78], "'DO NOT RUN AS ROOT! Create an unprivileged user '"]]

Fair-Exchange/electrumx@9a9f78030d9b9308dac7a7032da442b51a61b657

fix a typo Fixes a typo.

electrumx

59d8421c8775d3a9415af6e5b4ef8276baffe1d5

b4ac4b6a0538e81a69315db881d039f77a04d5e0

server/db.py

https://github.com/Fair-Exchange/electrumx

@@ -315,7 +315,7 @@ class DB(util.LoggedClass): genesis_hash = genesis_hash.decode() if genesis_hash != self.coin.GENESIS_HASH: raise self.DBError('DB genesis hash {} does not match coin {}' - .format(state['genesis_hash'], + .format(genesis_hash, self.coin.GENESIS_HASH)) self.db_height = state['height'] self.db_tx_count = state['tx_count']

raise self . DBError ( 'DB genesis hash {} does not match coin {}' . format ( state [ 'genesis_hash' ] , self . coin . GENESIS_HASH ) )

raise self . DBError ( 'DB genesis hash {} does not match coin {}' . format ( genesis_hash , self . coin . GENESIS_HASH ) )

SINGLE_STMT

[["Update", ["identifier:state", 3, 44, 3, 49], "genesis_hash"], ["Move", ["argument_list", 3, 43, 4, 67], ["identifier:state", 3, 44, 3, 49], 1], ["Delete", ["[:[", 3, 49, 3, 50]], ["Delete", ["string:'genesis_hash'", 3, 50, 3, 64]], ["Delete", ["]:]", 3, 64, 3, 65]], ["Delete", ["subscript", 3, 44, 3, 65]]]

Fair-Exchange/electrumx@59d8421c8775d3a9415af6e5b4ef8276baffe1d5

Fix KeyError on incorrect genesis hash (#224) Fix KeyError that occurs when creating an exception for an incorrect genesis hash.

electrumx

efe86c67f287b33701dcdb2198f2fef587ea0be1

137236712fc82067f74b274643b7bc832dd5a050

setup.py

https://github.com/Fair-Exchange/electrumx

@@ -11,7 +11,7 @@ setuptools.setup( # via environment variables, in which case I've tested with 15.0.4 # "x11_hash" package (1.4) is required to sync DASH network. install_requires=['plyvel', 'pylru', 'irc', 'aiohttp >= 1'], - packages=setuptools.find_packages(), + packages=setuptools.find_packages(exclude=['tests']), description='ElectrumX Server', author='Neil Booth', author_email='[email protected]',

packages = setuptools . find_packages ( ) ,

packages = setuptools . find_packages ( exclude = [ 'tests' ] ) ,

SAME_FUNCTION_MORE_ARGS

[["Insert", ["argument_list", 3, 38, 3, 40], ["keyword_argument", "N0"], 1], ["Insert", "N0", ["identifier:exclude", "T"], 0], ["Insert", "N0", ["=:=", "T"], 1], ["Insert", "N0", ["list", "N1"], 2], ["Insert", "N1", ["[:[", "T"], 0], ["Insert", "N1", ["string:'tests'", "T"], 1], ["Insert", "N1", ["]:]", "T"], 2]]

Fair-Exchange/electrumx@efe86c67f287b33701dcdb2198f2fef587ea0be1

Exclude tests directory from installation Fixes #223

electrumx

09783aeacc3bae679fa599aae14d9bba23260d63

2a955a922a42c989924873546d47403a94c8dd91

server/version.py

https://github.com/Fair-Exchange/electrumx

@@ -1,5 +1,5 @@ # Server name and protocol versions VERSION = 'ElectrumX 1.0.17' -PROTOCOL_MIN = '0.10' +PROTOCOL_MIN = '0.9' PROTOCOL_MAX = '1.1'

PROTOCOL_MIN = '0.10'

PROTOCOL_MIN = '0.9'

CHANGE_STRING_LITERAL

[["Update", ["string:'0.10'", 3, 16, 3, 22], "'0.9'"]]

Fair-Exchange/electrumx@09783aeacc3bae679fa599aae14d9bba23260d63

Accept protocols down to 0.9 for Electrum 1.x clients Fixes #248

visbrain

3c92656d21014dcfdb6e24925a3ca3bc612392c9

4d2d18c3721179fdacfd4da5c8ba51a750e16cb0

visbrain/io/mneio.py

https://github.com/kdeleeuw11/visbrain

@@ -1,6 +1,6 @@ """Utility functions for MNE.""" -__all__ = ('mne_switch') +__all__ = ['mne_switch'] def mne_switch(file, ext, *args, **kwargs):

__all__ = ( 'mne_switch' )

__all__ = [ 'mne_switch' ]

SINGLE_STMT

[["Insert", ["assignment", 2, 1, 2, 25], ["list", "N0"], 2], ["Insert", "N0", ["[:[", "T"], 0], ["Move", "N0", ["string:'mne_switch'", 2, 12, 2, 24], 1], ["Insert", "N0", ["]:]", "T"], 2], ["Delete", ["(:(", 2, 11, 2, 12]], ["Delete", ["):)", 2, 24, 2, 25]], ["Delete", ["parenthesized_expression", 2, 11, 2, 25]]]

kdeleeuw11/visbrain@3c92656d21014dcfdb6e24925a3ca3bc612392c9

Fix mneio __all__ import

visbrain

4ce5b31ad543e9522f9a378eec2cde147fc8e22a

e51a6fd8d98b349472846406fc385322d9fe3826

visbrain/io/read_sleep.py

https://github.com/kdeleeuw11/visbrain

@@ -591,7 +591,7 @@ def read_elan(path, downsample): # Last 2 channels do not contain data nb_chan_data = nb_chan - 2 - chan_list = slice(nb_chan) + chan_list = slice(nb_chan_data) chan = ent[10:10 + nb_chan_data] # Gain

chan_list = slice ( nb_chan )

chan_list = slice ( nb_chan_data )

CHANGE_IDENTIFIER_USED

[["Update", ["identifier:nb_chan", 3, 23, 3, 30], "nb_chan_data"]]

kdeleeuw11/visbrain@4ce5b31ad543e9522f9a378eec2cde147fc8e22a

Fix wrong number of channels for ELAN

visbrain

2b2139ee9656962a764b1553c724a8317658f507

a9422f74b9a6c6d31e1f237f9c7221d12e1569e3

test/test_sleep.py

https://github.com/kdeleeuw11/visbrain

@@ -23,7 +23,7 @@ onset = np.array([100, 2000, 5000]) app = QtWidgets.QApplication([]) sp = Sleep(data=data, channels=channels, sf=sf, downsample=100., hypno=hypno, axis=False, hedit=True, - annotation_file=onset) + annotation=onset) class TestSleep(object):

sp = Sleep ( data = data , channels = channels , sf = sf , downsample = 100. , hypno = hypno , axis = False , hedit = True , annotation_file = onset )

sp = Sleep ( data = data , channels = channels , sf = sf , downsample = 100. , hypno = hypno , axis = False , hedit = True , annotation = onset )

CHANGE_KEYWORD_ARGUMENT_USED

[["Update", ["identifier:annotation_file", 3, 12, 3, 27], "annotation"]]

kdeleeuw11/visbrain@2b2139ee9656962a764b1553c724a8317658f507

Fix sleep annotations testing

visbrain

1d2034c588eea08329252a04c5eea6e71cc6c5f1

672d150ed7b4c10a56fb90c46da3fb6191576cd7

test/test_sleep.py

https://github.com/kdeleeuw11/visbrain

@@ -23,7 +23,7 @@ onset = np.array([100, 2000, 5000]) app = QtWidgets.QApplication([]) sp = Sleep(data=data, channels=channels, sf=sf, downsample=100., hypno=hypno, axis=False, hedit=True, - annotation_file=onset) + annotation=onset) class TestSleep(object):

sp = Sleep ( data = data , channels = channels , sf = sf , downsample = 100. , hypno = hypno , axis = False , hedit = True , annotation_file = onset )

sp = Sleep ( data = data , channels = channels , sf = sf , downsample = 100. , hypno = hypno , axis = False , hedit = True , annotation = onset )

CHANGE_KEYWORD_ARGUMENT_USED

[["Update", ["identifier:annotation_file", 3, 12, 3, 27], "annotation"]]

kdeleeuw11/visbrain@1d2034c588eea08329252a04c5eea6e71cc6c5f1

Fix sleep annotations testing

visbrain

aea3ff96184ec60d8f349ac357a452a85b5d4e3e

6a043b37e1d1fd9f67c6ea24add7fad0e4d76386

test/test_sleep.py

https://github.com/kdeleeuw11/visbrain

@@ -23,7 +23,7 @@ onset = np.array([100, 2000, 5000]) app = QtWidgets.QApplication([]) sp = Sleep(data=data, channels=channels, sf=sf, downsample=100., hypno=hypno, axis=False, hedit=True, - annotation=onset) + annotations=onset) class TestSleep(object):

sp = Sleep ( data = data , channels = channels , sf = sf , downsample = 100. , hypno = hypno , axis = False , hedit = True , annotation = onset )

sp = Sleep ( data = data , channels = channels , sf = sf , downsample = 100. , hypno = hypno , axis = False , hedit = True , annotations = onset )

CHANGE_KEYWORD_ARGUMENT_USED

[["Update", ["identifier:annotation", 3, 12, 3, 22], "annotations"]]

kdeleeuw11/visbrain@aea3ff96184ec60d8f349ac357a452a85b5d4e3e

Fix test_sleep

visbrain

a1e6ba782374aed8e3cf144d2212fe9f7065cb45

80144c74c8780d7ab38e12c191a048ac5db2fd4a

visbrain/io/read_sleep.py

https://github.com/kdeleeuw11/visbrain

@@ -73,7 +73,7 @@ class ReadSleepData(object): raise ValueError("When passing raw data, the sampling " "frequency parameter, sf, must either be an " "integer or a float.") - file = None + file = annot = None offset = datetime.time(0, 0, 0) dsf, downsample = get_dsf(downsample, sf) n = data.shape[1]

file = None

file = annot = None

SINGLE_STMT

[["Insert", ["assignment", 3, 13, 3, 24], ["assignment", "N0"], 2], ["Insert", "N0", ["identifier:annot", "T"], 0], ["Insert", "N0", ["=:=", "T"], 1], ["Move", "N0", ["none:None", 3, 20, 3, 24], 2]]

kdeleeuw11/visbrain@a1e6ba782374aed8e3cf144d2212fe9f7065cb45

Fix annotations for Sleep raw data

visbrain

c269ff1ce14286a35a95fa60089d4f6b89bfdb53

91906b6bbc3383af54a172847ba51281dc677322

visbrain/visuals/PicVisual.py

https://github.com/kdeleeuw11/visbrain

@@ -145,7 +145,7 @@ class PicVisual(visuals.Visual): # Build the default grid of index : nr, nc = self.nrows, self.ncols g = np.arange(nr * nc).reshape(nc, nr) - g = np.fliplr(np.flipud(g.T)) + g = np.fliplr(g.T) # np.fliplr(np.flipud(g.T)) # Build indices for one map : index = np.zeros((2 * (nr - 1) * (nc - 1), 3)) q = 0

g = np . fliplr ( np . flipud ( g . T ) )

g = np . fliplr ( g . T )

SINGLE_STMT

[["Delete", ["(:(", 3, 22, 3, 23]], ["Delete", ["):)", 3, 37, 3, 38]]]

kdeleeuw11/visbrain@c269ff1ce14286a35a95fa60089d4f6b89bfdb53

Fix wrong picture orientation

visbrain

4c46940e6f1f2827e51367c92cba1c37529efcda

935493f95cf98b3e7afce829e8fe28c22d479121

test/test_utils.py

https://github.com/kdeleeuw11/visbrain

@@ -739,7 +739,7 @@ class TestHypnoprocessing(object): def test_sleepstats(self): """Test function sleepstats.""" hypno = np.random.randint(-1, 3, (2000,)) - sleepstats(None, hypno, len(hypno), time_window=1.) + sleepstats(hypno, 100.) ############################################################################### ###############################################################################

sleepstats ( None , hypno , len ( hypno ) , time_window = 1. )

sleepstats ( hypno , 100. )

SINGLE_STMT

[["Move", [",:,", 3, 24, 3, 25], ["argument_list", 3, 19, 3, 60], 3], ["Insert", ["argument_list", 3, 19, 3, 60], ["float:100.", "T"], 3], ["Move", ["argument_list", 3, 19, 3, 60], ["):)", 3, 42, 3, 43], 4], ["Delete", ["none:None", 3, 20, 3, 24]], ["Delete", [",:,", 3, 31, 3, 32]], ["Delete", ["identifier:len", 3, 33, 3, 36]], ["Delete", ["(:(", 3, 36, 3, 37]], ["Delete", ["identifier:hypno", 3, 37, 3, 42]], ["Delete", ["argument_list", 3, 36, 3, 43]], ["Delete", ["call", 3, 33, 3, 43]], ["Delete", [",:,", 3, 43, 3, 44]], ["Delete", ["identifier:time_window", 3, 45, 3, 56]], ["Delete", ["=:=", 3, 56, 3, 57]], ["Delete", ["float:1.", 3, 57, 3, 59]], ["Delete", ["keyword_argument", 3, 45, 3, 59]], ["Delete", ["):)", 3, 59, 3, 60]]]

kdeleeuw11/visbrain@4c46940e6f1f2827e51367c92cba1c37529efcda

Fix test_sleepstats

visbrain

679b8ae98fd8988d3cae4274cbf6fdc53679870f

4385cd874d6190530f4f658344e5b7ed3c82064e

visbrain/visuals/PicVisual.py

https://github.com/kdeleeuw11/visbrain

@@ -145,7 +145,7 @@ class PicVisual(visuals.Visual): # Build the default grid of index : nr, nc = self.nrows, self.ncols g = np.arange(nr * nc).reshape(nc, nr) - g = np.fliplr(np.flipud(g.T)) + g = np.fliplr(g.T) # np.fliplr(np.flipud(g.T)) # Build indices for one map : index = np.zeros((2 * (nr - 1) * (nc - 1), 3)) q = 0

g = np . fliplr ( np . flipud ( g . T ) )

g = np . fliplr ( g . T )

SINGLE_STMT

[["Delete", ["(:(", 3, 22, 3, 23]], ["Delete", ["):)", 3, 37, 3, 38]]]

kdeleeuw11/visbrain@679b8ae98fd8988d3cae4274cbf6fdc53679870f

Fix wrong picture orientation

visbrain

932a91cfc7166f5a29dbafb51909fd06f522e5bb

d4c268a12045e531cbb600cd72077f5f90bb76e3

visbrain/utils/sigproc.py

https://github.com/kdeleeuw11/visbrain

@@ -248,7 +248,7 @@ def averaging(ts, n_window, axis=-1, overlap=0., window='flat'): # Get axis : npts = ts.shape[axis] - axis = npts - 1 if axis == -1 else axis + axis = ts.ndim - 1 if axis == -1 else axis # Get overlap step in samples : n_overlap = int(np.round(n_window * (1. - overlap)))

axis = npts - 1 if axis == - 1 else axis

axis = ts . ndim - 1 if axis == - 1 else axis

CHANGE_BINARY_OPERAND

[["Insert", ["binary_operator", 3, 12, 3, 20], ["attribute", "N0"], 0], ["Update", ["identifier:npts", 3, 12, 3, 16], "ts"], ["Move", "N0", ["identifier:npts", 3, 12, 3, 16], 0], ["Insert", "N0", [".:.", "T"], 1], ["Insert", "N0", ["identifier:ndim", "T"], 2]]

kdeleeuw11/visbrain@932a91cfc7166f5a29dbafb51909fd06f522e5bb

Fix axis=-1 for averaging

visbrain

ee72e935b4064c61750bf646be717e054216a95f

36e7f96c9ac1b071d0d31d19b2863b81db596541

visbrain/signal/ui_elements/ui_init.py

https://github.com/kdeleeuw11/visbrain

@@ -433,7 +433,7 @@ class UiInit(QtWidgets.QMainWindow, Ui_MainWindow, app.Canvas): self.setupUi(self) # Canvas creation : - cargs = {'size': (300, 300)} + cargs = {'size': (800, 600)} self._grid_canvas = VisbrainCanvas(axis=False, name='Grid', cargs=cargs, **kwargs) self._signal_canvas = VisbrainCanvas(axis=True, name='Signal',

cargs = { 'size' : ( 300 , 300 ) }

cargs = { 'size' : ( 800 , 600 ) }

SINGLE_STMT

[["Update", ["integer:300", 3, 27, 3, 30], "800"], ["Update", ["integer:300", 3, 32, 3, 35], "600"]]

kdeleeuw11/visbrain@ee72e935b4064c61750bf646be717e054216a95f

Change default canvas size

visbrain

11f7556119042da12e76304347783615b0766d46

34dc0e8934c03be245f841c7d91600e700a36e88

visbrain/sleep/visuals/visuals.py

https://github.com/kdeleeuw11/visbrain

@@ -469,7 +469,7 @@ class Spectrogram(PrepareData): self.freq = self.tf.freqs else: # =================== CONVERSION =================== - overlap = int(round(overlap * nperseg)) + overlap = int(round(overlap * sf)) # =================== COMPUTE =================== # Compute the spectrogram :

else : overlap = int ( round ( overlap * nperseg ) )

else : overlap = int ( round ( overlap * sf ) )

CHANGE_BINARY_OPERAND

[["Update", ["identifier:nperseg", 3, 43, 3, 50], "sf"]]

kdeleeuw11/visbrain@11f7556119042da12e76304347783615b0766d46

fixed bug overlap scipy spectrogram

visbrain

21c18ec7e734a722f3d19217d9c57967e74f18e1

a6f1fcaa695daa58059ff59b12539c38e58e4440

test/test_brain.py

https://github.com/kdeleeuw11/visbrain

@@ -317,7 +317,7 @@ class TestBrain(object): try: vb.screenshot(name, print_size=k, unit=i, dpi=50) except: - warn("Screenshot failed for print size" + k + " and unit" + warn("Screenshot failed for print size" + str(k) + " and unit" " " + i + " transparent canvas") # Test factor : name = self._path_to_tmp('main_factor.png')

warn ( "Screenshot failed for print size" + k + " and unit" " " + i + " transparent canvas" )

warn ( "Screenshot failed for print size" + str ( k ) + " and unit" " " + i + " transparent canvas" )

ADD_FUNCTION_AROUND_EXPRESSION

[["Insert", ["binary_operator", 3, 22, 3, 60], ["call", "N0"], 2], ["Insert", "N0", ["identifier:str", "T"], 0], ["Insert", "N0", ["argument_list", "N1"], 1], ["Insert", "N1", ["(:(", "T"], 0], ["Move", "N1", ["identifier:k", 3, 59, 3, 60], 1], ["Insert", "N1", ["):)", "T"], 2]]

kdeleeuw11/visbrain@21c18ec7e734a722f3d19217d9c57967e74f18e1

fix warning

visbrain

bbe22ec5e2599594b3dbb7f45c6ac5ee4ce9b044

857d833b5e6f225bbb464db2de065f10a15f5257

visbrain/utils/filtering.py

https://github.com/kdeleeuw11/visbrain

@@ -206,7 +206,7 @@ def morlet_power(x, freqs, sf, norm=True): def welch_power(x, freqs, sf, window_s=10, norm=True): - """Compute bandwise-normalized power of data using morlet wavelet. + """Compute bandwise-normalized power of data using welch power. Parameters ----------

bandwise - normalized power of data using morlet wavelet . Parameters

bandwise - normalized power of data using welch power . Parameters

SINGLE_STMT

[["Update", ["identifier:morlet", 3, 56, 3, 62], "welch"], ["Update", ["identifier:wavelet", 3, 63, 3, 70], "power"]]

kdeleeuw11/visbrain@bbe22ec5e2599594b3dbb7f45c6ac5ee4ce9b044

Fix welch power doc

visbrain

da3e3ea0bd85a3032cfeb34021da97025b291cab

a0edef4dd1d0408e5783ff07705eb18e0cf89046

visbrain/utils/filtering.py

https://github.com/kdeleeuw11/visbrain

@@ -231,7 +231,7 @@ def welch_power(x, freqs, sf, window_s=10, norm=True): sf = int(sf) freq_spacing = .1 - n_epoch = int(len(x) / (window_s * sf)) + n_epoch = max(1, int(len(x) / (window_s * sf))) xpow = np.zeros((len(freqs) - 1, n_epoch), dtype=np.float)

n_epoch = int ( len ( x ) / ( window_s * sf ) )

n_epoch = max ( 1 , int ( len ( x ) / ( window_s * sf ) ) )

ADD_FUNCTION_AROUND_EXPRESSION

[["Insert", ["call", 2, 15, 2, 44], ["identifier:max", "T"], 0], ["Insert", ["call", 2, 15, 2, 44], ["argument_list", "N0"], 1], ["Insert", "N0", ["(:(", "T"], 0], ["Insert", "N0", ["integer:1", "T"], 1], ["Insert", "N0", [",:,", "T"], 2], ["Move", "N0", ["call", 2, 15, 2, 44], 3], ["Insert", "N0", ["):)", "T"], 4]]

kdeleeuw11/visbrain@da3e3ea0bd85a3032cfeb34021da97025b291cab

Fix n_epoch if `n_epoch = 0`

visbrain

ec1225f9a9a36a45bcfc4c6408608f118f8caf68

89d7de95287a455721ec34cf79eca5a0b5d5336d

visbrain/visuals/PicVisual.py

https://github.com/kdeleeuw11/visbrain

@@ -54,7 +54,7 @@ class PicVisual(visuals.Visual): visuals.Visual.__init__(self, VERT_SHADER, FRAG_SHADER) # Select pictures : - if (select is not None) and (len(select) == pos.shape[0]): + if isinstance(select, (list, np.ndarray)): data = data[select, ...] pos = pos[select, ...]

if ( select is not None ) and ( len ( select ) == pos . shape [ 0 ] ) : data = data [ select , ... ] pos = pos [ select , ... ]

if isinstance ( select , ( list , np . ndarray ) ) : data = data [ select , ... ] pos = pos [ select , ... ]

SINGLE_STMT

[["Insert", ["if_statement", 3, 9, 5, 35], ["call", "N0"], 1], ["Insert", "N0", ["identifier:isinstance", "T"], 0], ["Insert", "N0", ["argument_list", "N1"], 1], ["Move", "N1", ["(:(", 3, 12, 3, 13], 0], ["Move", "N1", ["identifier:select", 3, 13, 3, 19], 1], ["Insert", "N1", [",:,", "T"], 2], ["Insert", "N1", ["tuple", "N2"], 3], ["Move", "N1", ["):)", 3, 65, 3, 66], 4], ["Move", "N2", ["(:(", 3, 41, 3, 42], 0], ["Update", ["identifier:select", 3, 42, 3, 48], "list"], ["Move", "N2", ["identifier:select", 3, 42, 3, 48], 1], ["Insert", "N2", [",:,", "T"], 2], ["Move", "N2", ["attribute", 3, 53, 3, 62], 3], ["Insert", "N2", ["):)", "T"], 4], ["Update", ["identifier:pos", 3, 53, 3, 56], "np"], ["Update", ["identifier:shape", 3, 57, 3, 62], "ndarray"], ["Delete", ["is:is", 3, 20, 3, 22]], ["Delete", ["not:not", 3, 23, 3, 26]], ["Delete", ["none:None", 3, 27, 3, 31]], ["Delete", ["comparison_operator", 3, 13, 3, 31]], ["Delete", ["):)", 3, 31, 3, 32]], ["Delete", ["parenthesized_expression", 3, 12, 3, 32]], ["Delete", ["and:and", 3, 33, 3, 36]], ["Delete", ["(:(", 3, 37, 3, 38]], ["Delete", ["identifier:len", 3, 38, 3, 41]], ["Delete", ["):)", 3, 48, 3, 49]], ["Delete", ["argument_list", 3, 41, 3, 49]], ["Delete", ["call", 3, 38, 3, 49]], ["Delete", ["==:==", 3, 50, 3, 52]], ["Delete", ["[:[", 3, 62, 3, 63]], ["Delete", ["integer:0", 3, 63, 3, 64]], ["Delete", ["]:]", 3, 64, 3, 65]], ["Delete", ["subscript", 3, 53, 3, 65]], ["Delete", ["comparison_operator", 3, 38, 3, 65]], ["Delete", ["parenthesized_expression", 3, 37, 3, 66]], ["Delete", ["boolean_operator", 3, 12, 3, 66]]]

kdeleeuw11/visbrain@ec1225f9a9a36a45bcfc4c6408608f118f8caf68

Fix select type for PicVisual

visbrain

27930d5ddec98014afc213a60bcf10c3f71bcf1f

bd3e24c5018ac32a9215d00dbbacb6c82906bafa

visbrain/utils/physio.py

https://github.com/kdeleeuw11/visbrain

@@ -345,7 +345,7 @@ def load_predefined_roi(name): name = name.lower() assert name in ['brodmann', 'aal', 'talairach'] # Load archive : - file = os.path.join(*(get_data_path(), 'roi', name + '.npz')) + file = get_data_path(folder='roi', file=name + '.npz') arch = np.load(file) # Extract informations : vol, hdr = arch['vol'], arch['hdr']

file = os . path . join ( * ( get_data_path ( ) , 'roi' , name + '.npz' ) )

file = get_data_path ( folder = 'roi' , file = name + '.npz' )

SINGLE_STMT

[["Update", ["identifier:os", 3, 12, 3, 14], "get_data_path"], ["Move", ["call", 3, 12, 3, 66], ["identifier:os", 3, 12, 3, 14], 0], ["Insert", ["argument_list", 3, 24, 3, 66], ["keyword_argument", "N0"], 1], ["Move", ["argument_list", 3, 24, 3, 66], [",:,", 3, 42, 3, 43], 2], ["Insert", ["argument_list", 3, 24, 3, 66], ["keyword_argument", "N1"], 3], ["Move", ["argument_list", 3, 24, 3, 66], ["):)", 3, 64, 3, 65], 4], ["Update", ["identifier:get_data_path", 3, 27, 3, 40], "folder"], ["Move", "N0", ["identifier:get_data_path", 3, 27, 3, 40], 0], ["Insert", "N0", ["=:=", "T"], 1], ["Insert", "N0", ["string:'roi'", "T"], 2], ["Insert", "N1", ["identifier:file", "T"], 0], ["Insert", "N1", ["=:=", "T"], 1], ["Move", "N1", ["binary_operator", 3, 51, 3, 64], 2], ["Delete", [".:.", 3, 14, 3, 15]], ["Delete", ["identifier:path", 3, 15, 3, 19]], ["Delete", ["attribute", 3, 12, 3, 19]], ["Delete", [".:.", 3, 19, 3, 20]], ["Delete", ["identifier:join", 3, 20, 3, 24]], ["Delete", ["attribute", 3, 12, 3, 24]], ["Delete", ["*:*", 3, 25, 3, 26]], ["Delete", ["(:(", 3, 26, 3, 27]], ["Delete", ["(:(", 3, 40, 3, 41]], ["Delete", ["):)", 3, 41, 3, 42]], ["Delete", ["argument_list", 3, 40, 3, 42]], ["Delete", ["call", 3, 27, 3, 42]], ["Delete", ["string:'roi'", 3, 44, 3, 49]], ["Delete", [",:,", 3, 49, 3, 50]], ["Delete", ["tuple", 3, 26, 3, 65]], ["Delete", ["list_splat", 3, 25, 3, 65]], ["Delete", ["):)", 3, 65, 3, 66]]]

kdeleeuw11/visbrain@27930d5ddec98014afc213a60bcf10c3f71bcf1f

Fix get_data_path in physio

visbrain

116f89f671904ab26e3a096f68646f661da8ee3b

471c5c6bc063b5f8ab164d696ea59d90ceba11fe

visbrain/objects/visbrain_obj.py

https://github.com/kdeleeuw11/visbrain

@@ -41,7 +41,7 @@ class VisbrainObject(object): """Return the object name.""" return self._name - def preview(self, bgcolor='white', axis=True, show=True): + def preview(self, bgcolor='white', axis=False, show=True):

def preview ( self , bgcolor = 'white' , axis = True , show = True ) :

def preview ( self , bgcolor = 'white' , axis = False , show = True ) :

CHANGE_BOOLEAN_LITERAL

[["Insert", ["default_parameter", 3, 40, 3, 49], ["false:False", "T"], 2], ["Delete", ["true:True", 3, 45, 3, 49]]]

kdeleeuw11/visbrain@116f89f671904ab26e3a096f68646f661da8ee3b

By default hide axis on preview

visbrain

7d7d89c8f9f0ae56afe38ff0e9548c62f5b51501

c3d4c43cd9b10fda244f265eff1f1b3a52b00583

visbrain/io/download.py

https://github.com/kdeleeuw11/visbrain

@@ -124,7 +124,7 @@ def download_file(name, filename=None, to_path=None, unzip=False, return path_to_file -def path_to_visbrain_data(folder=None, file=None): +def path_to_visbrain_data(file=None, folder=None):

def path_to_visbrain_data ( folder = None , file = None ) :

def path_to_visbrain_data ( file = None , folder = None ) :

SINGLE_STMT

[["Move", ["default_parameter", 3, 27, 3, 38], ["parameters", 3, 26, 3, 50], 2], ["Move", ["default_parameter", 3, 40, 3, 49], ["parameters", 3, 26, 3, 50], 1]]

kdeleeuw11/visbrain@7d7d89c8f9f0ae56afe38ff0e9548c62f5b51501

Fix folder // file in path_to_visbrain_data

visbrain

7325c0e70835750d24f730fec7e76bf0f55d9baf

9dabc40f7a73215c2afa6d834826fc738daf39a0

test/test_utils.py

https://github.com/kdeleeuw11/visbrain

@@ -613,7 +613,7 @@ class TestOthers(object): import vispy.visuals.transforms as vist # Force creation of vertices, faces and normals : self._creation() - tup = (self.vertices, self.faces, self.normals) + tup = (self.vertices, self.faces) # Compare (vertices + faces) Vs. MeshData : mesh1 = convert_meshdata(*tup) mesh2 = convert_meshdata(meshdata=MeshData(*tup))

tup = ( self . vertices , self . faces , self . normals )

tup = ( self . vertices , self . faces )

SINGLE_STMT

[["Delete", [",:,", 3, 41, 3, 42]], ["Delete", ["identifier:self", 3, 43, 3, 47]], ["Delete", [".:.", 3, 47, 3, 48]], ["Delete", ["identifier:normals", 3, 48, 3, 55]], ["Delete", ["attribute", 3, 43, 3, 55]]]

kdeleeuw11/visbrain@7325c0e70835750d24f730fec7e76bf0f55d9baf

Fix convert_meshdata test

visbrain

55c910534164557b55a1e0fe296b2da7221b6f2a

7325c0e70835750d24f730fec7e76bf0f55d9baf

visbrain/utils/others.py

https://github.com/kdeleeuw11/visbrain

@@ -133,7 +133,7 @@ def convert_meshdata(vertices=None, faces=None, normals=None, meshdata=None, if meshdata is not None: vertices = meshdata.get_vertices() faces = meshdata.get_faces() - normals = meshdata.get_vertex_normals(indexed='faces') + normals = meshdata.get_vertex_normals() logger.debug('Indexed faces normals converted // extracted') else: # Check if faces index start at zero (Matlab like):

normals = meshdata . get_vertex_normals ( indexed = 'faces' )

normals = meshdata . get_vertex_normals ( )

SAME_FUNCTION_LESS_ARGS

[["Delete", ["identifier:indexed", 3, 47, 3, 54]], ["Delete", ["=:=", 3, 54, 3, 55]], ["Delete", ["string:'faces'", 3, 55, 3, 62]], ["Delete", ["keyword_argument", 3, 47, 3, 62]]]

kdeleeuw11/visbrain@55c910534164557b55a1e0fe296b2da7221b6f2a

Fix MeshData in convert_meshdata