Merge pull request #126 from wasade/latin1_bug

Latin1 bug

redbiom/_requests.py

@@ -6,12 +6,17 @@ def _parse_validate_request(req, command):
     return req.json()[command]
 
 
-def _format_request(context, command, other):
+def _format_request(context, command, other, as_bytes=False):
     """Merge commands, context and payload"""
     if context is None:
-        return "%s/%s.json" % (command, other)
+        data = "%s/%s.json" % (command, other)
     else:
-        return "%s/%s:%s.json" % (command, context, other)
+        data = "%s/%s:%s.json" % (command, context, other)
+
+    if as_bytes:
+        return data.encode('utf-8')
+    else:
+        return data
 
 
 def get_session():
@@ -55,7 +60,8 @@ def f(context, cmd, payload):
     else:
         def f(context, cmd, payload, verbose=False):
             req = s.post(config['hostname'],
-                         data=_format_request(context, cmd, payload))
+                         data=_format_request(context, cmd, payload,
+                                              as_bytes=True))
 
             if verbose:
                 print(context, cmd, payload[:100])

redbiom/tests/test_admin.py

@@ -343,8 +343,14 @@ def test_load_sample_metadata_content_type_sample_id_bug(self):
         self.assertIn(cur + '.raw', obs)
 
     def test_load_sample_metadata_full_search(self):
-        redbiom.admin.load_sample_metadata(metadata)
-        redbiom.admin.load_sample_metadata_full_search(metadata)
+        md = metadata.copy()
+
+        # valid portion of a name in Czech Republic, but which does not encode
+        # in python's http client
+        md.iloc[0]['STATE'] = "Vysočina"
+
+        redbiom.admin.load_sample_metadata(md)
+        redbiom.admin.load_sample_metadata_full_search(md)
         tests = [('agp-skin', {'10317.000003302', }),
 
                  # an example of a misleading query. only those AG samples