From 90993f11538945913843f9eed10e7990015fa118 Mon Sep 17 00:00:00 2001
From: Thomas Nagy <tnagy@waf.io>
Date: Sat, 3 Dec 2016 06:47:27 +0100
Subject: [PATCH] Remove c_preproc.trimquotes

---
 ChangeLog                 |  2 ++
 tests/preproc/wscript     |  6 ------
 waflib/Tools/c_preproc.py | 16 ----------------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 756784a4..5c6019fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,3 +8,5 @@ NEW IN WAF 2.0.0
 * Remove the BuildContext.rule decorator
 * Remove Task.update_outputs, Task.always_run
 * Remove atleast-version, exact-version and max-version from conf.check_cfg
+* Remove c_preproc.trimquotes
+
diff --git a/tests/preproc/wscript b/tests/preproc/wscript
index 1fb0792e..d03a4436 100644
--- a/tests/preproc/wscript
+++ b/tests/preproc/wscript
@@ -16,12 +16,6 @@ from waflib.Logs import pprint
 def configure(conf):
 	pass
 
-def trimquotes(s):
-	if not s: return ''
-	s = s.rstrip()
-	if s[0] == "'" and s[-1] == "'": return s[1:-1]
-	return s
-
 def build(bld):
 
 	bld.failure = 0
diff --git a/waflib/Tools/c_preproc.py b/waflib/Tools/c_preproc.py
index 8a3fdc2e..32c41dd4 100644
--- a/waflib/Tools/c_preproc.py
+++ b/waflib/Tools/c_preproc.py
@@ -155,22 +155,6 @@ for x, syms in enumerate(ops):
 	for u in syms.split():
 		prec[u] = x
 
-def trimquotes(s):
-	"""
-	Remove the single quotes around an expression::
-
-		trimquotes("'test'") == "test"
-
-	:param s: expression to transform
-	:type s: string
-	:rtype: string
-	"""
-	# TODO remove in waf 2.0
-	if not s: return ''
-	s = s.rstrip()
-	if s[0] == "'" and s[-1] == "'": return s[1:-1]
-	return s
-
 def reduce_nums(val_1, val_2, val_op):
 	"""
 	Apply arithmetic rules to compute a result