[tor-commits] [flashproxy/master] Undo get_script_dir factoring.

[dcf at torproject.org]

commit c9fe23c3f501c461262d9fa0dea3fcdaf8a292cd
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Jul 1 00:01:10 2013 -0700

    Undo get_script_dir factoring.
---
 flashproxy-client |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/flashproxy-client b/flashproxy-client
index 18b5634..0afec8d 100755
--- a/flashproxy-client
+++ b/flashproxy-client
@@ -978,7 +978,7 @@ def proxy_loop():
             websocket_pending.pop(0)
             report_pending()
 
-def get_script_dir():
+def build_register_command(method):
     # sys.path[0] usually contains the directory the script is located in.
     # py2exe overwrites this for bundled executables.
     if getattr(sys, "frozen", False):
@@ -988,10 +988,6 @@ def get_script_dir():
     if not script_dir:
         # Maybe the script was read from stdin; in any case don't guess at the directory.
         raise ValueError("Can't find executable directory for registration helpers")
-    return script_dir
-
-def build_register_command(method):
-    script_dir = get_script_dir()
     af = []
     if options.address_family == socket.AF_INET:
         af = ["-4"]