1
=== modified file 'tests/qmlapicheck.py'
2
--- tests/qmlapicheck.py	2014-05-26 16:03:32 +0000
3
+++ tests/qmlapicheck.py	2014-06-25 10:17:31 +0000
4
@@ -63,12 +63,12 @@
5
63
                fullpath = folder + '/' + filename
63
                fullpath = folder + '/' + filename
6
64
                classname = pieces[0]
64
                classname = pieces[0]
7
65
                version = pieces[1]
65
                version = pieces[1]
9
66
                if not fullpath in inputfiles:
66
                if fullpath not in inputfiles:
10
67
                    inputfiles.append(fullpath)
67
                    inputfiles.append(fullpath)
11
68
                    classes[fullpath] = [classname, version]
68
                    classes[fullpath] = [classname, version]
12
69
                else:
69
                else:
13
70
                    versions = classes[fullpath]
70
                    versions = classes[fullpath]
15
71
                    if not classname in versions:
71
                    if classname not in versions:
16
72
                        versions.append(classname)
72
                        versions.append(classname)
17
73
                    versions.append(version)
73
                    versions.append(version)
18
74
    else:
74
    else:
19
@@ -118,7 +118,7 @@
20
118
        # internal without type always relates to the next declared property
118
        # internal without type always relates to the next declared property
21
119
        annotated_properties['internal'] = 'internal'
119
        annotated_properties['internal'] = 'internal'
22
120
120
24
121
    if '/*' in line and not '*/' in line:
121
    if '/*' in line and '*/' not in line:
25
122
        in_comment = True
122
        in_comment = True
26
123
        continue
123
        continue
27
124
    if '*/' in line:
124
    if '*/' in line:
28
@@ -133,7 +133,7 @@
29
133
            continue
133
            continue
30
134
134
31
135
    # End of function/ signal/ Item block
135
    # End of function/ signal/ Item block
33
136
    if '}' in line and not '{' in line:
136
    if '}' in line and '{' not in line:
34
137
        in_block -= 1
137
        in_block -= 1
35
138
        block_meta = {}
138
        block_meta = {}
36
139
        if in_block == 1 and in_builtin_type:
139
        if in_block == 1 and in_builtin_type:
37
@@ -162,7 +162,7 @@
38
162
162
39
163
        block_meta[words[0]] = line
163
        block_meta[words[0]] = line
40
164
        # Omit prototype if it comes before the name since we may skip it
164
        # Omit prototype if it comes before the name since we may skip it
42
165
        if not 'name' in block_meta and words[0] == 'prototype':
165
        if 'name' not in block_meta and words[0] == 'prototype':
43
166
            continue
166
            continue
44
167
167
45
168
        # Don't consider the qml variable name as a keyword
168
        # Don't consider the qml variable name as a keyword
46
@@ -183,10 +183,10 @@
47
183
                            no_mods = no_mods.replace(mod, '')
183
                            no_mods = no_mods.replace(mod, '')
48
184
                        name = no_mods.strip().split(' ')[2]
184
                        name = no_mods.strip().split(' ')[2]
49
185
                        if 'internal' in annotated_properties:
185
                        if 'internal' in annotated_properties:
51
186
                            if not name in annotated_properties:
186
                            if name not in annotated_properties:
52
187
                                annotated_properties[name] = 'internal'
187
                                annotated_properties[name] = 'internal'
53
188
                            del annotated_properties['internal']
188
                            del annotated_properties['internal']
55
189
                        if not name in annotated_properties:
189
                        if name not in annotated_properties:
56
190
                            print('    %s' % (signature))
190
                            print('    %s' % (signature))
57
191
                            print('Error: Missing \\qmlproperty for %s' % name)
191
                            print('Error: Missing \\qmlproperty for %s' % name)
58
192
                            sys.exit(1)
192
                            sys.exit(1)
59
@@ -199,7 +199,7 @@
60
199
                break
199
                break
61
200
200
62
201
    # Start of function/ signal/ Item block
201
    # Start of function/ signal/ Item block
64
202
    if '{' in line and not '}' in line:
202
    if '{' in line and '}' not in line:
65
203
        in_block += 1
203
        in_block += 1
66
204
        block_meta = {}
204
        block_meta = {}
67
205
        # The parent type can affect API
205
        # The parent type can affect API
Status:	Merged
Approved by:	Tim Peeters on 2014-06-25
Approved revision:	1117
Merged at revision:	1117
Proposed branch:	lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/notIn
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	67 lines (+8/-8) 1 file modified tests/qmlapicheck.py (+8/-8)
To merge this branch:	bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/notIn
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-06-25
Zsombor Egri		2014-06-25	Approve on 2014-06-25
Review via email: mp+224409@code.launchpad.net
1	=== modified file 'tests/qmlapicheck.py'
2	--- tests/qmlapicheck.py 2014-05-26 16:03:32 +0000
3	+++ tests/qmlapicheck.py 2014-06-25 10:17:31 +0000
4	@@ -63,12 +63,12 @@
5	63	fullpath = folder + '/' + filename	63	fullpath = folder + '/' + filename
6	64	classname = pieces[0]	64	classname = pieces[0]
7	65	version = pieces[1]	65	version = pieces[1]
9	66	if not fullpath in inputfiles:	66	if fullpath not in inputfiles:
10	67	inputfiles.append(fullpath)	67	inputfiles.append(fullpath)
11	68	classes[fullpath] = [classname, version]	68	classes[fullpath] = [classname, version]
12	69	else:	69	else:
13	70	versions = classes[fullpath]	70	versions = classes[fullpath]
15	71	if not classname in versions:	71	if classname not in versions:
16	72	versions.append(classname)	72	versions.append(classname)
17	73	versions.append(version)	73	versions.append(version)
18	74	else:	74	else:
19	@@ -118,7 +118,7 @@
20	118	# internal without type always relates to the next declared property	118	# internal without type always relates to the next declared property
21	119	annotated_properties['internal'] = 'internal'	119	annotated_properties['internal'] = 'internal'
22	120		120
24	121	if '/' in line and not '/' in line:	121	if '/' in line and '/' not in line:
25	122	in_comment = True	122	in_comment = True
26	123	continue	123	continue
27	124	if '*/' in line:	124	if '*/' in line:
28	@@ -133,7 +133,7 @@
29	133	continue	133	continue
30	134		134
31	135	# End of function/ signal/ Item block	135	# End of function/ signal/ Item block
33	136	if '}' in line and not '{' in line:	136	if '}' in line and '{' not in line:
34	137	in_block -= 1	137	in_block -= 1
35	138	block_meta = {}	138	block_meta = {}
36	139	if in_block == 1 and in_builtin_type:	139	if in_block == 1 and in_builtin_type:
37	@@ -162,7 +162,7 @@
38	162		162
39	163	block_meta[words[0]] = line	163	block_meta[words[0]] = line
40	164	# Omit prototype if it comes before the name since we may skip it	164	# Omit prototype if it comes before the name since we may skip it
42	165	if not 'name' in block_meta and words[0] == 'prototype':	165	if 'name' not in block_meta and words[0] == 'prototype':
43	166	continue	166	continue
44	167		167
45	168	# Don't consider the qml variable name as a keyword	168	# Don't consider the qml variable name as a keyword
46	@@ -183,10 +183,10 @@
47	183	no_mods = no_mods.replace(mod, '')	183	no_mods = no_mods.replace(mod, '')
48	184	name = no_mods.strip().split(' ')[2]	184	name = no_mods.strip().split(' ')[2]
49	185	if 'internal' in annotated_properties:	185	if 'internal' in annotated_properties:
51	186	if not name in annotated_properties:	186	if name not in annotated_properties:
52	187	annotated_properties[name] = 'internal'	187	annotated_properties[name] = 'internal'
53	188	del annotated_properties['internal']	188	del annotated_properties['internal']
55	189	if not name in annotated_properties:	189	if name not in annotated_properties:
56	190	print(' %s' % (signature))	190	print(' %s' % (signature))
57	191	print('Error: Missing \\qmlproperty for %s' % name)	191	print('Error: Missing \\qmlproperty for %s' % name)
58	192	sys.exit(1)	192	sys.exit(1)
59	@@ -199,7 +199,7 @@
60	199	break	199	break
61	200		200
62	201	# Start of function/ signal/ Item block	201	# Start of function/ signal/ Item block
64	202	if '{' in line and not '}' in line:	202	if '{' in line and '}' not in line:
65	203	in_block += 1	203	in_block += 1
66	204	block_meta = {}	204	block_meta = {}
67	205	# The parent type can affect API	205	# The parent type can affect API