Merge pull request #9 from lbryio/master

Update

.bumpversion.cfg

@@ -1,8 +1,7 @@
 [bumpversion]
-current_version = 0.3.21
+current_version = 0.3.22
 commit = True
 tag = True
-message = Bump version: {current_version} -> {new_version}
 
 [bumpversion:file:lbrynet/__init__.py]
 

lbrynet/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.3.21"
+__version__ = "0.3.22"
 version = tuple(__version__.split('.'))

lbrynet/lbrynet_daemon/LBRYDaemon.py

@@ -426,7 +426,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
         except jsonrpclib.Fault, f:
             self._cbRender(f, request, id, version)
         else:
-            request.setHeader("Access-Control-Allow-Origin", "*")
+            request.setHeader("Access-Control-Allow-Origin", "localhost")
             request.setHeader("content-type", "text/json")
             if args == [{}]:
                 d = defer.maybeDeferred(function)

lbrynet/lbrynet_daemon/LBRYDaemonServer.py

@@ -380,9 +380,17 @@ class LBRYFileUpload(resource.Resource):
         if os.name == "nt":
             shutil.copy(uploaded_file.name, newpath)
             # TODO Still need to remove the file
+
+            # TODO deal with pylint error in cleaner fashion than this
+            try:
+                from exceptions import WindowsError as win_except
+            except ImportError as e:
+                log.error("This shouldn't happen")
+                win_except = Exception
+
             try:
                 os.remove(uploaded_file.name)
-            except WindowsError as e:
+            except win_except as e:
                 pass
         else:
             shutil.move(uploaded_file.name, newpath)

packaging/ubuntu/lbry.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=0.3.21
+Version=0.3.22
 Name=LBRY
 Comment=The world's first user-owned content marketplace
 Icon=lbry