#12025 - Add city information to anonymized.py

anonymized.py

 #!/usr/bin/env python
 """Anonymize data in access log lines.
 
 Read a line from stdin, write it to stdout with the following changes:
 1. IP (v4 or v6) replaced with a salted hash of the IP and the date
 2. Country and city information (extracted from IP) added after the salted hash.
 
-If the country or city information is unavailable in the database, '-' is added instead
-of ISO 3166-1 alpha-2 country/city code (like 'DE').
+If the country or city information is unavailable in the database,
+'-' is added instead of ISO 3166-1 alpha-2 country code (like DE) &
+city name (like 'Berlin').
 
-Salt and the country/city information database are taken as command line options and
-default to environment variables.
+Salt and the country/city information database are taken
+as command line options and default to environment variables.
 
 Malformed lines are passed on as is, based on the assumption that they don't
 contain sensitive information. Malformed here means the line couldn't be split
 on space character. If it could be split, and an error occurs afterwards
 (e.g. while trying to parse out the date), the script will fail and exit in
 order to bring attention to the fact that something might not be getting
 anonymized.
 """
 
 from __future__ import print_function
@@ skipping 81 matching lines @@
     )
 
     args = parser.parse_args()
 
     if args.salt is None or args.country_db is None or args.city_db is None:
         parser.print_help()
         sys.exit(1)
 
     main(args.salt, args.country_db, args.city_db)