Merge pull request #1546 from MITx/fix/cdodge/make-jump-to-handle-lost-slash

add a 'missing slash' regular expression for Location patterns in order ...

common/lib/xmodule/xmodule/modulestore/__init__.py

@@ -23,6 +23,15 @@ URL_RE = re.compile("""
     (@(?P<revision>[^/]+))?
     """, re.VERBOSE)
 
+MISSING_SLASH_URL_RE = re.compile("""
+    (?P<tag>[^:]+):/
+    (?P<org>[^/]+)/
+    (?P<course>[^/]+)/
+    (?P<category>[^/]+)/
+    (?P<name>[^@]+)
+    (@(?P<revision>[^/]+))?
+    """, re.VERBOSE)
+
 # TODO (cpennington): We should decide whether we want to expand the
 # list of valid characters in a location
 INVALID_CHARS = re.compile(r"[^\w.-]")
@@ -164,12 +173,16 @@ class Location(_LocationBase):
         if isinstance(location, basestring):
             match = URL_RE.match(location)
             if match is None:
-                log.debug('location is instance of %s but no URL match' % basestring)
-                raise InvalidLocationError(location)
-            else:
-                groups = match.groupdict()
-                check_dict(groups)
-                return _LocationBase.__new__(_cls, **groups)
+                # cdodge:
+                # check for a dropped slash near the i4x:// element of the location string. This can happen with some
+                # redirects (e.g. edx.org -> www.edx.org which I think happens in Nginx)
+                match = MISSING_SLASH_URL_RE.match(location)
+                if match is None:
+                    log.debug('location is instance of %s but no URL match' % basestring)
+                    raise InvalidLocationError(location)    
+            groups = match.groupdict()
+            check_dict(groups)
+            return _LocationBase.__new__(_cls, **groups)
         elif isinstance(location, (list, tuple)):
             if len(location) not in (5, 6):
                 log.debug('location has wrong length')