Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/notIn into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Change "not…in" to "…not in" in qmlapicheck.py

[Zsombor Egri (zsombi)]

Kewl stuff, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1117
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/462/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1055
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/294
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/294
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/294/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/294
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2060
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2060/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8832
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/880
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1198
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1198/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/462/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/199/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1192/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/143
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/143
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1529/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2065
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2065/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8834
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/882
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1201
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1201/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/qmlapicheck.py'
--- tests/qmlapicheck.py	2014-05-26 16:03:32 +0000
+++ tests/qmlapicheck.py	2014-06-25 10:17:31 +0000
@@ -63,12 +63,12 @@
                 fullpath = folder + '/' + filename
                 classname = pieces[0]
                 version = pieces[1]
-                if not fullpath in inputfiles:
+                if fullpath not in inputfiles:
                     inputfiles.append(fullpath)
                     classes[fullpath] = [classname, version]
                 else:
                     versions = classes[fullpath]
-                    if not classname in versions:
+                    if classname not in versions:
                         versions.append(classname)
                     versions.append(version)
     else:
@@ -118,7 +118,7 @@
         # internal without type always relates to the next declared property
         annotated_properties['internal'] = 'internal'
 
-    if '/*' in line and not '*/' in line:
+    if '/*' in line and '*/' not in line:
         in_comment = True
         continue
     if '*/' in line:
@@ -133,7 +133,7 @@
             continue
 
     # End of function/ signal/ Item block
-    if '}' in line and not '{' in line:
+    if '}' in line and '{' not in line:
         in_block -= 1
         block_meta = {}
         if in_block == 1 and in_builtin_type:
@@ -162,7 +162,7 @@
 
         block_meta[words[0]] = line
         # Omit prototype if it comes before the name since we may skip it
-        if not 'name' in block_meta and words[0] == 'prototype':
+        if 'name' not in block_meta and words[0] == 'prototype':
             continue
 
         # Don't consider the qml variable name as a keyword
@@ -183,10 +183,10 @@
                             no_mods = no_mods.replace(mod, '')
                         name = no_mods.strip().split(' ')[2]
                         if 'internal' in annotated_properties:
-                            if not name in annotated_properties:
+                            if name not in annotated_properties:
                                 annotated_properties[name] = 'internal'
                             del annotated_properties['internal']
-                        if not name in annotated_properties:
+                        if name not in annotated_properties:
                             print('    %s' % (signature))
                             print('Error: Missing \\qmlproperty for %s' % name)
                             sys.exit(1)
@@ -199,7 +199,7 @@
                 break
 
     # Start of function/ signal/ Item block
-    if '{' in line and not '}' in line:
+    if '{' in line and '}' not in line:
         in_block += 1
         block_meta = {}
         # The parent type can affect API