unicode, my old nemesis

Author: keflavich

astroquery/alma/core.py

@@ -113,6 +113,7 @@ def stage_data(self, uids, cache=False):
         response = self._request('POST', url, data=payload,
                                  timeout=self.TIMEOUT, cache=cache)
         self._staging_log['initial_response'] = response
+        assert 'j_spring_cas_security_check' not in response.url
 
         request_id = response.url.split("/")[-2]
         self._staging_log['request_id'] = request_id
@@ -246,4 +247,7 @@ def clean_uid(uid):
     """
     Return a uid with all unacceptable characters replaced with underscores
     """
-    return uid.replace("/","_").replace(":","_")
+    try:
+        return uid.decode('utf-8').replace(u"/",u"_").replace(u":",u"_")
+    except AttributeError:
+        return uid.replace("/","_").replace(":","_")

astroquery/alma/tests/test_alma.py

@@ -36,5 +36,5 @@ def test_SgrAstar(monkeypatch):
 
     # test that max_results = 50
     assert len(result) == 82
-    assert '2011.0.00217.S' in result['Project_code']
+    assert b'2011.0.00217.S' in result['Project_code']
 

astroquery/alma/tests/test_alma_remote.py

@@ -24,18 +24,18 @@ def test_SgrAstar(self, temp_dir):
         alma.cache_location = temp_dir
 
         result_s = alma.query_object('Sgr A*')
-        assert '2011.0.00217.S' in result_s['Project_code']
+        assert b'2011.0.00217.S' in result_s['Project_code']
         c = coordinates.SkyCoord(266.41681662*u.deg, -29.00782497*u.deg,
                                  frame='fk5')
         result_c = alma.query_region(c, 1*u.deg)
-        assert '2011.0.00217.S' in result_c['Project_code']
+        assert b'2011.0.00217.S' in result_c['Project_code']
 
     def test_stage_data(self, temp_dir):
         alma = Alma()
         alma.cache_location = temp_dir
 
         result_s = alma.query_object('Sgr A*')
-        assert '2011.0.00217.S' in result_s['Project_code']
+        assert b'2011.0.00217.S' in result_s['Project_code']
 
         uid = result_s['Asdm_uid'][0]