david_walker avatar david_walker committed f93417a Merge

prevent pycountry logging complaint by adding null handler

Comments (0)

Files changed (1)

 """
 
 import re
-import pycountry
 import unicodedata
 from abc import ABCMeta, abstractmethod
 from collections import namedtuple
 import logging
 
+# Prevent complaint that pycountry doesn't have a logger from going to
+# stderr
+logging.getLogger('pycountry').addHandler(logging.NullHandler())
+import pycountry
+
 AttrChange = namedtuple('AttrChange', 'attr, value')
 
-
 class Relation(object):
     """Namespace for constants used to describe relation between
     transforms.
     abbreviations = [
         AbbrevInfo(ur'e\.g\.'),
         AbbrevInfo(ur'i\.e\.'),
+        AbbrevInfo(ur'a\.m\.'),
+        AbbrevInfo(ur'p\.m\.'),
         AbbrevInfo(ur'etc\.'),
         AbbrevInfo(ur'mr\.', u'Mr.'),
         AbbrevInfo(ur'mrs\.', u'Mrs.'),
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.