Merge lp:~salgado/launchpad/bug-422552 into lp:launchpad

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

= Summary =

As seen in the logs of the script which parses librarian log files to
count downloads, there are errors when parsing some lines. These errors
prevent the script from parsing the remaining of the files.

The error happens when the request string has multiple consecutive white
spaces.

== Proposed fix ==

Fix the bug by normalizing white spaces in the request string

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/scripts/tests/test_librarian_apache_log_parser.py
  lib/lp/services/apachelogparser/base.py

== Pylint notices ==

lib/lp/services/apachelogparser/base.py
    11: [F0401] Unable to import 'lazr.uri' (No module named uri)

[Brad Crittenden (bac)]

As discussed on IRC I think you can replace request.split(' ') with request.split() and do away with the normalization. Having the test in place is great, too.

review: Approve (code)

=== modified file 'lib/canonical/launchpad/scripts/tests/test_librarian_apache_log_parser.py'
--- lib/canonical/launchpad/scripts/tests/test_librarian_apache_log_parser.py	2009-08-31 15:01:54 +0000
+++ lib/canonical/launchpad/scripts/tests/test_librarian_apache_log_parser.py	2009-12-22 16:13:16 +0000
@@ -47,6 +47,12 @@
         request = 'GET //8196569//foo HTTP/1.1'
         self.assertMethodAndFileIDAreCorrect(request)
 
+    def test_multiple_consecutive_white_spaces(self):
+        # Some request strings might have multiple consecutive white spaces,
+        # but they're parsed just like if they didn't have the extra spaces.
+        request = 'GET /8196569/mediumubuntulogo.png  HTTP/1.1'
+        self.assertMethodAndFileIDAreCorrect(request)
+
     def test_return_value_for_https_path(self):
         request = ('GET https://launchpadlibrarian.net/8196569/'
                    'mediumubuntulogo.png HTTP/1.1')

=== modified file 'lib/lp/services/apachelogparser/base.py'
--- lib/lp/services/apachelogparser/base.py	2009-11-17 18:36:20 +0000
+++ lib/lp/services/apachelogparser/base.py	2009-12-22 16:13:16 +0000
@@ -176,7 +176,7 @@
 
 def get_method_and_path(request):
     """Extract the method of the request and path of the requested file."""
-    L = request.split(' ')
+    L = request.split()
     # HTTP 1.0 requests might omit the HTTP version so we must cope with them.
     if len(L) == 2:
         method, path = L