emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[ELPA-diffs] /srv/bzr/emacs/elpa r218: re.match always searches from the


From: Glenn Morris
Subject: [ELPA-diffs] /srv/bzr/emacs/elpa r218: re.match always searches from the start, so no need for ^.
Date: Tue, 22 May 2012 23:40:00 -0700
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 218
committer: Glenn Morris <address@hidden>
branch nick: elpa
timestamp: Tue 2012-05-22 23:40:00 -0700
message:
  re.match always searches from the start, so no need for ^.
  Tweak missing packagedir error message.
modified:
  admin/forward-diffs.py
=== modified file 'admin/forward-diffs.py'
--- a/admin/forward-diffs.py    2012-05-22 16:23:03 +0000
+++ b/admin/forward-diffs.py    2012-05-23 06:40:00 +0000
@@ -90,7 +90,7 @@
 
 
 if not os.path.isdir(opts.packagedir):
-    sys.stderr.write('Error reading packagedir\n')
+    sys.stderr.write('No such directory: %s\n' % opts.packagedir)
     sys.exit(1)
 
 
@@ -111,7 +111,7 @@
 maints = {}
 
 for line in mfile:
-    if re.match( '^#|^ *$', line ): continue
+    if re.match( '#| *$', line ): continue
     (pack, maint) = line.split()
     maints[pack] = maint.split(',')
 
@@ -126,7 +126,7 @@
         sys.exit(1)
 
     for line in ofile:
-        if re.match( '^#|^ *$', line ): continue
+        if re.match( '#| *$', line ): continue
         (pack, maint) = line.split()
         maints[pack] = maint.split(',')
 
@@ -159,16 +159,16 @@
 
 for line in text.splitlines():
 
-    if re.match( '^modified:$', line ):
+    if re.match( 'modified:$', line ):
         start = True
         continue
 
     if not start: continue
 
-    if re.match( '^ *$', line ): break
-
-
-    reg = re.match( '^packages/([^/]+)', line.strip() )
+    if re.match( ' *$', line ): break
+
+
+    reg = re.match( 'packages/([^/]+)', line.strip() )
     if not reg: break
 
 


reply via email to

[Prev in Thread] Current Thread [Next in Thread]