Merge "SwiftClient object upload beginning with / or "./""

1 files changed, 4 insertions, 4 deletions

diff --git a/swiftclient/service.py b/swiftclient/service.py
index ba21a49..d7c05ca 100644
--- a/swiftclient/service.py
+++ b/swiftclient/service.py
@@ -1599,6 +1599,10 @@ class SwiftService(object):
 
     def _upload_object_job(self, conn, container, source, obj, options,
                            results_queue=None):
+        if obj.startswith('./') or obj.startswith('.\\'):
+            obj = obj[2:]
+        if obj.startswith('/'):
+            obj = obj[1:]
         res = {
             'action': 'upload_object',
             'container': container,
@@ -1611,10 +1615,6 @@ class SwiftService(object):
             path = source
         res['path'] = path
         try:
-            if obj.startswith('./') or obj.startswith('.\\'):
-                obj = obj[2:]
-            if obj.startswith('/'):
-                obj = obj[1:]
             if path is not None:
                 put_headers = {'x-object-meta-mtime': "%f" % getmtime(path)}
             else: