use the correct sep. chars between req and comment, closes #183

pyupio · Jan 19, 2017 · 8390df4 · 8390df4
1 parent 6c5bcc2
commit 8390df4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/pyup/requirements.py b/pyup/requirements.py
@@ -389,7 +389,18 @@ def update_content(self, content, update_hashes=True):
             new_line += ";" + self.line.split(";", 1)[1].split("#")[0].rstrip()
         # add the comment
         if "#" in self.line:
-            new_line += " #" + "#".join(self.line.splitlines()[0].split("#")[1:])
+            # split the line into parts: requirement and comment
+            parts = self.line.splitlines()[0].split("#")
+            requirement, comment = parts[0], "#".join(parts[1:])
+            # find all whitespaces between the requirement and the comment
+            whitespaces = (hex(ord('\t')), hex(ord(' ')))
+            trailing_whitespace = ''
+            for c in requirement[::-1]:
+                if hex(ord(c)) in whitespaces:
+                    trailing_whitespace += c
+                else:
+                    break
+            new_line += trailing_whitespace + "#" + comment
         # if this is a hashed requirement, add a multiline break before the comment
         if self.hashes and not new_line.endswith("\\"):
             new_line += " \\"

diff --git a/tests/test_requirements.py b/tests/test_requirements.py
@@ -12,6 +12,21 @@
 
 class RequirementUpdateContent(TestCase):
 
+    def test_update_contains_correct_sep_char(self):
+
+        with patch('pyup.requirements.Requirement.latest_version_within_specs',
+                   new_callable=PropertyMock,
+                   return_value="2.9.5"):
+            content = "Jinja2==2.9.4         # via flask"
+            req_file = RequirementFile("req.txt", content)
+            req = list(req_file.requirements)[0]
+            self.assertEqual(
+                Requirement.parse("Jinja2==2.9.4         # via flask", 1),
+                req
+            )
+
+            self.assertEqual(req.update_content(content), "Jinja2==2.9.5         # via flask")
+
     @patch("pyup.requirements.hashin.get_package_hashes")
     def test_update_with_hashes(self, get_hashes_mock):
         get_hashes_mock.return_value = {
@@ -111,12 +126,12 @@ def test_update_content_tabbed(self):
             content = "bla==1.4.1\t\t# some foo"
             req = Requirement.parse(content, 0)
 
-            self.assertEqual(req.update_content(content), "bla==1.4.2 # some foo")
+            self.assertEqual(req.update_content(content), "bla==1.4.2\t\t# some foo")
 
             content = "bla==1.4.1\t\t# pyup: <1.4.2"
             req = Requirement.parse(content, 0)
 
-            self.assertEqual(req.update_content(content), "bla==1.4.2 # pyup: <1.4.2")
+            self.assertEqual(req.update_content(content), "bla==1.4.2\t\t# pyup: <1.4.2")
 
     def test_something_else(self):
         with patch('pyup.requirements.Requirement.latest_version', new_callable=PropertyMock,