peerdb/tripe-newpeers.in: Upper-case the compiled regexp names.

Just a cosmetic change.

diff --git a/peerdb/tripe-newpeers.in b/peerdb/tripe-newpeers.in
index adc847f..59fd85f 100644 (file)
--- a/peerdb/tripe-newpeers.in
+++ b/peerdb/tripe-newpeers.in
@@ -104,10 +104,10 @@ class BulkResolver (object):
 ### The configuration parser.
 
 ## Match a $(VAR) configuration variable reference; group 1 is the VAR.
 ### The configuration parser.
 
 ## Match a $(VAR) configuration variable reference; group 1 is the VAR.

-r_ref = RX.compile(r'\$\(([^)]+)\)')
+RX_REF = RX.compile(r'(?x) \$ \( ([^)]+) \)')

 
 ## Match a $[HOST] name resolution reference; group 1 is the HOST.
 
 ## Match a $[HOST] name resolution reference; group 1 is the HOST.

-r_resolve = RX.compile(r'\$\[([^]]+)\]')
+RX_RESOLVE = RX.compile(r'(?x) \$ \[ ([^]]+) \]')

 
 def _fmt_path(path):
   return ' -> '.join(["`%s'" % hop for hop in path])
 
 def _fmt_path(path):
   return ' -> '.join(["`%s'" % hop for hop in path])


@@ -181,7 +181,7 @@ class MyConfigParser (CP.RawConfigParser):
     """
     for sec in me.sections():
       for key, value in me.items(sec, resolvep = False):
     """
     for sec in me.sections():
       for key, value in me.items(sec, resolvep = False):

-        for match in r_resolve.finditer(value):
+        for match in RX_RESOLVE.finditer(value):

           me._resolver.prepare(match.group(1))
     me._resolver.run()
 
           me._resolver.prepare(match.group(1))
     me._resolver.run()
 


@@ -194,11 +194,11 @@ class MyConfigParser (CP.RawConfigParser):
     or not?  This is turned off by the resolve() method while it's collecting
     hostnames to be resolved.
     """
     or not?  This is turned off by the resolve() method while it's collecting
     hostnames to be resolved.
     """

-    string = r_ref.sub \
+    string = RX_REF.sub \

              (lambda m: me.get(sec, m.group(1), resolvep), string)
     if resolvep:
              (lambda m: me.get(sec, m.group(1), resolvep), string)
     if resolvep:

-      string = r_resolve.sub(lambda m: me._resolver.lookup(m.group(1)),
-                             string)
+      string = RX_RESOLVE.sub(lambda m: me._resolver.lookup(m.group(1)),
+                              string)

     return string
 
   def has_option(me, sec, key):
     return string
 
   def has_option(me, sec, key):