[tor-commits] [obfsproxy/master] Fix path joining in scramblesuit/state.py.

asn at torproject.org asn at torproject.org
Wed Jul 16 15:24:31 UTC 2014


commit ee185b8904a6463e925e27df7e18e3e64e77b9fc
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Jul 15 16:42:15 2014 +0300

    Fix path joining in scramblesuit/state.py.
---
 obfsproxy/transports/scramblesuit/state.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/obfsproxy/transports/scramblesuit/state.py b/obfsproxy/transports/scramblesuit/state.py
index 8068914..5158f5e 100644
--- a/obfsproxy/transports/scramblesuit/state.py
+++ b/obfsproxy/transports/scramblesuit/state.py
@@ -30,7 +30,7 @@ def load( ):
     state file is found, a new one is created and returned.
     """
 
-    stateFile = const.STATE_LOCATION + const.SERVER_STATE_FILE
+    stateFile = os.path.join(const.STATE_LOCATION, const.SERVER_STATE_FILE)
 
     log.info("Attempting to load the server's state file from `%s'." %
              stateFile)
@@ -153,7 +153,7 @@ class State( object ):
         Write the state object to a file using the `cPickle' module.
         """
 
-        stateFile = const.STATE_LOCATION + const.SERVER_STATE_FILE
+        stateFile = os.path.join(const.STATE_LOCATION, const.SERVER_STATE_FILE)
 
         log.debug("Writing server's state file to `%s'." %
                   stateFile)





More information about the tor-commits mailing list