From eb66d7df452d4350b757eccc03f5005a2b3d773e Mon Sep 17 00:00:00 2001 From: Lubomír Sedlář Date: Feb 16 2016 16:31:05 +0000 Subject: Fix errors on Python 2.6 Signed-off-by: Lubomír Sedlář --- diff --git a/src/pyrpkg/__init__.py b/src/pyrpkg/__init__.py index 73b05ed..9473008 100644 --- a/src/pyrpkg/__init__.py +++ b/src/pyrpkg/__init__.py @@ -2327,14 +2327,16 @@ class Commands(object): # Create a list for unused patches unused = [] # Get the content of spec into memory for fast searching + with open(self.spec, 'r') as f: + data = f.read() try: - spec = open(self.spec, 'r').read().decode('UTF-8') + spec = data.decode('UTF-8') except UnicodeDecodeError as error: # when can't decode file, ignore chars and show warning - spec = open(self.spec, 'r').read().decode(encoding='UTF-8', errors='ignore') + spec = data.decode('UTF-8', 'ignore') line, offset = self._byte_offset_to_line_number(spec, error.start) - self.log.warning("\'%s\' codec can't decode byte in position %d:%d : %s" - % (error.encoding, line, offset, error.reason)) + self.log.warning("'%s' codec can't decode byte in position %d:%d : %s" + % (error.encoding, line, offset, error.reason)) # Replace %{name} with the package name spec = spec.replace("%{name}", self.module_name) # Replace %{version} with the package version diff --git a/test/commands/test_patch.py b/test/commands/test_patch.py index 18921f3..7d34da9 100644 --- a/test/commands/test_patch.py +++ b/test/commands/test_patch.py @@ -46,7 +46,7 @@ class CommandPatchTestCase(CommandTestCase): self.anongiturl, self.branchre, self.kojiconfig, self.build_client, self.user, self.dist, self.target, self.quiet) - text = self.text_utf8.decode(encoding='UTF-8', errors='ignore') + text = self.text_utf8.decode('UTF-8', 'ignore') line, offset = cmd._byte_offset_to_line_number(text, 9) #9 byte offset mean line 3 and second character self.assertEqual(line, 3)