Merge pull request #5086 from edx/renzo/fix-embargo-middleware

Refrain from accessing country code if country is None

common/djangoapps/embargo/middleware.py

@@ -166,7 +166,7 @@ class EmbargoMiddleware(object):
         profile_country = cache.get(cache_key)
         if profile_country is None:
             profile = getattr(user, 'profile', None)
-            if profile is not None:
+            if profile is not None and profile.country is not None:
                 profile_country = profile.country.code.upper()
             else:
                 profile_country = ""

common/djangoapps/embargo/tests/test_middleware.py

@@ -219,6 +219,7 @@ class EmbargoMiddlewareTests(ModuleStoreTestCase):
         self.assertEqual(response.status_code, 200)
 
     @ddt.data(
+        (None, False),
         ("", False),
         ("us", False),
         ("CU", True),