diff --git a/PRESUBMIT.py b/PRESUBMIT.py index c8a0213da7..16a3bb935e 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -97,6 +97,8 @@ def _CommonChecks(input_api, output_api): results.extend(input_api.canned_checks.RunPylint(input_api, output_api, black_list=(r'^.*gviz_api\.py$', r'^.*gaeunit\.py$', + # Embedded shell-script fakes out pylint. + r'^talk/site_scons/site_tools/talk_linux.py$', r'^third_party/.*\.py$', r'^testing/.*\.py$', r'^tools/gyp/.*\.py$', diff --git a/talk/PRESUBMIT.py b/talk/PRESUBMIT.py index 5fbda4a8ff..447b46d764 100644 --- a/talk/PRESUBMIT.py +++ b/talk/PRESUBMIT.py @@ -25,13 +25,13 @@ def _LicenseHeader(input_api): """Returns the license header regexp.""" - # Accept any year number from 2011 to the current year + # Accept any year number from 2008 to the current year current_year = int(input_api.time.strftime('%Y')) allowed_years = (str(s) for s in reversed(xrange(2008, current_year + 1))) years_re = '(' + '|'.join(allowed_years) + ')' license_header = ( r'.*? libjingle\n' - r'.*? Copyright %(year)s Google Inc\.\n' + r'.*? Copyright %(year)s,? Google Inc\.\n' r'.*?\n' r'.*? Redistribution and use in source and binary forms, with or without' r'\n' diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc index fa7418c37d..1d3c9cd897 100644 --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc @@ -1,6 +1,6 @@ /* * libjingle - * Copyright 2013 Google Inc. + * Copyright 2013, Google Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/talk/app/webrtc/peerconnectionfactory_unittest.cc b/talk/app/webrtc/peerconnectionfactory_unittest.cc index 6d54204283..a77fed7735 100644 --- a/talk/app/webrtc/peerconnectionfactory_unittest.cc +++ b/talk/app/webrtc/peerconnectionfactory_unittest.cc @@ -16,6 +16,8 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR diff --git a/talk/site_scons/site_tools/talk_noops.py b/talk/site_scons/site_tools/talk_noops.py index bb8f10622c..b184ddc542 100644 --- a/talk/site_scons/site_tools/talk_noops.py +++ b/talk/site_scons/site_tools/talk_noops.py @@ -16,5 +16,5 @@ def generate(env): ) env.Append(BUILDERS={'RES': builder, 'Grit': builder}) -def exists(env): +def exists(dummy): return 1 diff --git a/talk/site_scons/talk.py b/talk/site_scons/talk.py index a274d08c5b..745f1d813f 100644 --- a/talk/site_scons/talk.py +++ b/talk/site_scons/talk.py @@ -564,7 +564,7 @@ def ExtendComponent(env, component, **kwargs): # name of the EXE (but not PDB) is reconstructed after signing. postsignprefix = PopEntry(params, 'postsignprefix') if postsignprefix is not None: - target = postsignprefix + target + target = postsignprefix + target signed_node = env.SignedBinary( source = node, target = '$STAGING_DIR/' + target,