Skip to content

Commit

Permalink
Remove six from db
Browse files Browse the repository at this point in the history
  • Loading branch information
johannaengland committed Mar 23, 2022
1 parent 28efe6b commit c890973
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions python/nav/db/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#
# Copyright (C) 2006-2009 Uninett AS
# Copyright (C) 2022 Sikt
#
# This file is part of Network Administration Visualized (NAV).
#
Expand Down Expand Up @@ -27,8 +28,6 @@
import psycopg2
import psycopg2.extensions

import six

import nav
from nav import config

Expand Down Expand Up @@ -88,7 +87,7 @@ def escape(string):
"""
quoted = psycopg2.extensions.QuotedString(string)
result = quoted.getquoted()
return result if isinstance(result, six.text_type) else result.decode("utf-8")
return result if isinstance(result, str) else result.decode("utf-8")


def get_connection_parameters(script_name='default', database='nav'):
Expand Down

0 comments on commit c890973

Please sign in to comment.