Introduce a bit of sanity to talk/PRESUBMIT.py's license checking.
The comma this allows is a very common variant of the license header (3:1
preferred over the no-comma variant in talk/).
Also pacify pylint a bit, and correct a flagrantly incorrect header I happened
to come across.
BUG=2098,2133
R=henrike@webrtc.org, niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1866004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4396 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/PRESUBMIT.py b/talk/PRESUBMIT.py
index 5fbda4a..447b46d 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 fa7418c..1d3c9cd 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 6d54204..a77fed7 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 bb8f106..b184ddc 100644
--- a/talk/site_scons/site_tools/talk_noops.py
+++ b/talk/site_scons/site_tools/talk_noops.py
@@ -16,5 +16,5 @@
)
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 a274d08..745f1d8 100644
--- a/talk/site_scons/talk.py
+++ b/talk/site_scons/talk.py
@@ -564,7 +564,7 @@
# 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,