Merge pull request #229 from saltduck/upgrade_protobuf

Upgrade protobuf to 3.0.0b2 to fix unicode bugs

Author: hoffmabc

api/restapi.py

@@ -580,6 +580,8 @@ def delete_contract(self, request):
                 if "keywords" in c.contract["vendor_offer"]["listing"]["item"]:
                     for keyword in c.contract["vendor_offer"]["listing"]["item"]["keywords"]:
                         if keyword != "":
+                            if isinstance(keyword, unicode):
+                                keyword = keyword.encode('utf8')
                             self.kserver.delete(keyword.lower(), unhexlify(c.get_contract_id()),
                                                 self.keychain.signing_key.sign(
                                                     unhexlify(c.get_contract_id()))[:64])

market/contracts.py

@@ -923,6 +923,8 @@ def save(self):
         with open(file_path, 'w') as outfile:
             outfile.write(json.dumps(self.contract, indent=4))
 
+        if isinstance(self.previous_title, unicode):
+            self.previous_title = self.previous_title.encode('utf8')
         if self.previous_title and self.previous_title != self.contract["vendor_offer"]["listing"]["item"]["title"]:
             old_name = str(self.previous_title[:100])
             old_name = re.sub(r"[^\w\s]", '', file_name)

requirements.txt

@@ -1,4 +1,4 @@
-protobuf==2.6.1
+protobuf==3.0.0b2
 Twisted==14.0.2
 txrudp==0.5.1
 pystun==0.1.0