pglib 5.8.1__tar.gz → 5.9.0__tar.gz

{pglib-5.8.1/pglib.egg-info → pglib-5.9.0}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: pglib
-Version: 5.8.1
+Version: 5.9.0
 Summary: A PostgreSQL interface
 Home-page: https://gitlab.com/mkleehammer/pglib
 Maintainer: Michael Kleehammer
 Maintainer-email: michael@kleehammer.com
 License: MIT
 Keywords: postgresql postgres
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Database
@@ -21,5 +20,3 @@ A PostgreSQL interface for Python.
 This provides an interface to the libpq library.  It is not an DB API
 library, but is instead designed to match the interface PostgreSQL
 offers.
-
-

{pglib-5.8.1 → pglib-5.9.0}/pglib/__init__.py

@@ -4,7 +4,3 @@ from _pglib import *
 
 # The asynchronous code is in Python.
 from .asyncpglib import connect_async
-
-from ._version import get_versions
-__version__ = get_versions()['version']
-del get_versions

{pglib-5.8.1 → pglib-5.9.0/pglib.egg-info}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: pglib
-Version: 5.8.1
+Version: 5.9.0
 Summary: A PostgreSQL interface
 Home-page: https://gitlab.com/mkleehammer/pglib
 Maintainer: Michael Kleehammer
 Maintainer-email: michael@kleehammer.com
 License: MIT
 Keywords: postgresql postgres
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Database
@@ -21,5 +20,3 @@ A PostgreSQL interface for Python.
 This provides an interface to the libpq library.  It is not an DB API
 library, but is instead designed to match the interface PostgreSQL
 offers.
-
-

{pglib-5.8.1 → pglib-5.9.0}/pglib.egg-info/SOURCES.txt

@@ -21,7 +21,6 @@ setup.py
 /home/mkleehammer/dev/pglib/src/type_json.cpp
 /home/mkleehammer/dev/pglib/src/type_ltree.cpp
 pglib/__init__.py
-pglib/_version.py
 pglib/asyncpglib.py
 pglib.egg-info/PKG-INFO
 pglib.egg-info/SOURCES.txt

{pglib-5.8.1 → pglib-5.9.0}/setup.py

@@ -130,7 +130,7 @@ def _get_settings():
 
 setup(
     name='pglib',
-    version='5.8.1',
+    version='5.9.0',
     description='A PostgreSQL interface',
     long_description=long_description,
     maintainer='Michael Kleehammer',

{pglib-5.8.1 → pglib-5.9.0}/src/connection.cpp

@@ -150,6 +150,8 @@ static PGresult* internal_execute(PyObject* self, PyObject* args)
         return 0;
     }
     const char* szSQL = PyUnicode_AsUTF8(pSql);
+    if (!szSQL)
+        return 0;
 
     Params params(cParams);
     if (!BindParams(cnxn, params, args))
@@ -190,7 +192,11 @@ static PyObject* Connection_script(PyObject* self, PyObject* args)
     if (!PyArg_ParseTuple(args, "U", &pScript))
         return 0;
 
-    ResultHolder result = PQexec(cnxn->pgconn, PyUnicode_AsUTF8(pScript));
+    const char* szScript = PyUnicode_AsUTF8(pScript);
+    if (!szScript)
+        return 0;
+
+    ResultHolder result = PQexec(cnxn->pgconn, szScript);
     if (result == 0)
         return 0;
 
@@ -256,6 +262,9 @@ static PyObject* Connection_copy_from(PyObject* self, PyObject* args)
         return 0;
 
     const char* szSQL = PyUnicode_AsUTF8(command);
+    if (!szSQL)
+        return 0;
+
     ResultHolder result;
     Py_BEGIN_ALLOW_THREADS
     result = PQexec(cnxn->pgconn, szSQL);
@@ -413,8 +422,13 @@ static PyObject* Connection_copy_to_csv(PyObject* self, PyObject* args, PyObject
 
     Object sql(PyUnicode_FromFormat("copy %U to stdout with csv %s delimiter '%s' quote '%s'",
                                     table, header_token, pszDelimiter, pszQuote));
+    if (!sql)
+        return 0;
 
     const char* szSQL = PyUnicode_AsUTF8(sql);
+    if (!szSQL)
+        return 0;
+
     ResultHolder result;
     Py_BEGIN_ALLOW_THREADS
     result = PQexec(cnxn->pgconn, szSQL);
@@ -555,6 +569,9 @@ static PyObject* Connection_copy_from_csv(PyObject* self, PyObject* args, PyObje
         return 0;
 
     const char* szSQL = PyUnicode_AsUTF8(sql);
+    if (!szSQL)
+        return 0;
+
     ResultHolder result;
     Py_BEGIN_ALLOW_THREADS
     result = PQexec(cnxn->pgconn, szSQL);
@@ -1137,6 +1154,9 @@ static PyObject* Connection_sendQuery(PyObject* self, PyObject* args)
 
     int sent;
     const char* szSQL = PyUnicode_AsUTF8(pScript);
+    if (!szSQL)
+        return 0;
+
     Py_BEGIN_ALLOW_THREADS
     sent = PQsendQuery(cnxn->pgconn, szSQL);
     Py_END_ALLOW_THREADS
@@ -1176,7 +1196,10 @@ static PyObject* Connection_sendQueryParams(PyObject* self, PyObject* args)
         PyErr_SetString(PyExc_TypeError, "The first argument must be the SQL string.");
         return 0;
     }
+
     const char* szSQL = PyUnicode_AsUTF8(pSql);
+    if (!szSQL)
+        return 0;
 
     Params params(cParams);
     if (!BindParams(cnxn, params, args))

{pglib-5.8.1 → pglib-5.9.0}/src/getdata.cpp

@@ -286,8 +286,10 @@ static PyObject* GetInterval(const char* p) // , bool integer_datetimes)
     uint32_t month = swaps4(pinterval->month);
     uint32_t year = month / 12;
 
-    if (month || year)
-        return PyErr_Format(Error, "Years and months are not supported in intervals");
+    if (month || year) {
+        PyErr_SetString(Error, "Years and months are not supported in intervals");
+        return 0;
+    }
 
     int seconds = (second) + (60 * minute) + (3600 * hour);
     int days    = day;
@@ -399,6 +401,9 @@ PyObject* ConvertValue(PGresult* result, int iRow, int iCol, bool integer_dateti
     case TEXTARRAYOID:
         return GetTextArray(p);
 
+    case JSONBARRAYOID:
+        return GetJSONBArray(p);
+
     case DATEARRAYOID:
         return GetDateArray(p);
 

{pglib-5.8.1 → pglib-5.9.0}/src/params.cpp

@@ -124,7 +124,7 @@ WriteBuffer Params::Allocate(size_t amount)
     if (*pp == 0)
     {
         size_t total = amount + 1024;
-        *pp = (Pool*)malloc(total);
+        *pp = (Pool*)malloc(total + (sizeof(Pool) - 1));
 
         if (*pp == 0)
         {

{pglib-5.8.1 → pglib-5.9.0}/src/pgarrays.cpp

@@ -1,4 +1,3 @@
-
 // Sending and receiving arrays.  Right now we only support strings and integers, but there is
 // no reason we can't add more types.
 //
@@ -28,6 +27,7 @@
 #include "params.h"
 #include "juliandate.h"
 #include "errors.h"
+#include "runtime.h"
 #include "debug.h"
 
 
@@ -39,6 +39,12 @@ void Arrays_Init()
 
 struct ArrayHeader
 {
+    // The fields in a PostgreSQL array.  We use this when writing an array.  All int fields
+    // will be in host / big endian, so use ntohl and htonl.
+    //
+    // Technically an array header only includes the first 3 fields.  Each dimension then has a
+    // count and lbound.  Since we only support one dimension right now, I've put them together.
+
     uint32_t ndim;   // number of dimensions - we support 1
     uint32_t flags;  // binary format? 0 or 1, but unused by the server?
     Oid oid;         // type of elements
@@ -47,6 +53,46 @@ struct ArrayHeader
     char buffer[0];
 };
 
+
+struct ArrayInfo {
+    // The important array fields, copied and converted to native endianess (so don't use ntohl
+    // or htonl).
+    Oid oid;                    // type of elements
+    uint32_t len;               // number of elements
+    const char* data;           // pointer to first element
+};
+
+
+inline uint8_t ReadU8(const char ** pp) {
+    // Reads an unsigned int from `pp` *and* increments the pointer *pp.
+    uint8_t n = **(uint8_t**)pp;
+    *pp += sizeof(char);
+    return n;
+}
+
+inline int64_t Read64(const char ** pp) {
+    // Reads an int64 from `pp` *and* increments the pointer *pp.
+    uint64_t n = **(uint64_t**)pp;
+    *pp += sizeof(uint64_t);
+    return swaps8(n);
+}
+
+inline int32_t Read32(const char ** pp) {
+    // Reads an int from `pp` *and* increments the pointer *pp.
+    uint32_t n = **(uint32_t**)pp;
+    *pp += sizeof(uint32_t);
+    return (int32_t)htonl(n);
+}
+
+inline uint32_t ReadU32(const char ** pp) {
+    // Reads an unsigned int from `pp` *and* increments the pointer *pp.
+    uint32_t n = **(uint32_t**)pp;
+    *pp += sizeof(uint32_t);
+    return htonl(n);
+}
+
+
+
 static PyObject* FindFirstParam(Object& seq)
 {
     // Returns a *borrowed* reference to the first non-None parameter in the sequence.  Returns
@@ -63,6 +109,40 @@ static PyObject* FindFirstParam(Object& seq)
 }
 
 
+static bool ReadArrayInfo(const char* p, ArrayInfo &info, Oid expected_type) {
+    // Read the array header from `p` into `info` and return true if valid and something pglib
+    // can handle.  If there is an error, an exception will be set and false will be returned.
+    
+    uint32_t ndim = ReadU32(&p);
+    if (ndim > 1) {
+        SetStringError(Error, "pglib can only read single dimensional arrays (ndim=%d)", (int)ndim);
+        return false;
+    }
+
+    ReadU32(&p);  // format: 0 or 1.  Not used right now.
+
+    info.oid = (Oid)ReadU32(&p);
+    if (info.oid != expected_type) {
+        SetStringError(Error, "Unable to read array.  Expected element type %u not %u",
+                       (uint)expected_type, (uint)info.oid);
+        return false;
+    }
+
+    // The length is within the dimension header, which we don't have if there are no dimensions.
+
+    if (ndim != 0) {
+        info.len = ReadU32(&p);
+        ReadU32(&p);  // lower bound
+    } else {
+        info.len = 0;
+    }
+
+    info.data = p;
+
+    return true;
+}
+
+
 static bool BindDateArray(Params& params, Object& seq, Py_ssize_t cItems)
 {
     // Loop through the array and make sure each entry is a date.
@@ -328,26 +408,22 @@ bool BindArray(Params& params, PyObject* param)
 PyObject* GetDateArray(const char* p)
 {
     // Reads a DATEARRAYOID array result and returns a list of datetime.date objects.
+    ArrayInfo info;
+    if (!ReadArrayInfo(p, info, DATEOID)) {
+        return 0;
+    }
 
-    const ArrayHeader* phdr = (const ArrayHeader*)p;
-
-    if (ntohl(phdr->ndim) > 1)
-        return SetStringError(Error, "pglib can only read single dimensional arrays (ndim=%d)",
-                              ntohl(phdr->ndim));
-
-    Py_ssize_t dim = ntohl(phdr->ndim) == 0 ? 0 : ntohl(phdr->dim);
-
-    Object list(PyList_New(dim));
+    Object list(PyList_New(info.len));
     if (!list)
         return 0;
 
-    if (dim > 0)
-    {
-        int32_t* pT = (int32_t*)&phdr->buffer[0];
+    if (info.len) {
+        const char* data = info.data;
 
-        for (int i = 0; i < dim; i++)
+        for (uint32_t i = 0; i < info.len; i++)
         {
-            int32_t len = ntohl(*pT++);
+            int32_t len = Read32(&data);
+
             if (len == -1)
             {
                 Py_INCREF(Py_None);
@@ -355,7 +431,7 @@ PyObject* GetDateArray(const char* p)
             }
             else
             {
-                uint32_t value = swapu4(*pT++) + JULIAN_START;
+                uint32_t value = Read32(&data) + JULIAN_START;
                 int year, month, date;
                 julianToDate(value, year, month, date);
                 PyObject* d = PyDate_FromDate(year, month, date);
@@ -374,25 +450,22 @@ PyObject* GetInt4Array(const char* p)
 {
     // Reads an INT4ARRAYOID array result and returns a list of integers.
 
-    const ArrayHeader* phdr = (const ArrayHeader*)p;
-
-    if (ntohl(phdr->ndim) > 1)
-        return SetStringError(Error, "pglib can only read single dimensional arrays (ndim=%d)",
-                              ntohl(phdr->ndim));
-
-    Py_ssize_t dim = ntohl(phdr->ndim) == 0 ? 0 : ntohl(phdr->dim);
+    ArrayInfo info;
+    if (!ReadArrayInfo(p, info, INT4OID)) {
+        return 0;
+    }
 
-    Object list(PyList_New(dim));
+    Object list(PyList_New(info.len));
     if (!list)
         return 0;
 
-    if (dim > 0)
-    {
-        int32_t* pT = (int32_t*)&phdr->buffer[0];
+    if (info.len) {
+        const char* data = info.data;
 
-        for (int i = 0; i < dim; i++)
+        for (uint32_t i = 0; i < info.len; i++)
         {
-            int32_t len = ntohl(*pT++);
+            int32_t len = Read32(&data);
+
             if (len == -1)
             {
                 Py_INCREF(Py_None);
@@ -400,10 +473,11 @@ PyObject* GetInt4Array(const char* p)
             }
             else
             {
-                int32_t val = ntohl(*pT++);
+                int32_t val = Read32(&data);
                 PyObject* l = PyLong_FromLong(val);
                 if (!l)
                     return 0;
+
                 PyList_SET_ITEM(list.Get(), i, l);
             }
         }
@@ -416,26 +490,21 @@ PyObject* GetInt8Array(const char* p)
 {
     // Reads an INT4ARRAYOID array result and returns a list of integers.
 
-    const ArrayHeader* phdr = (const ArrayHeader*)p;
-
-    if (ntohl(phdr->ndim) > 1)
-        return SetStringError(Error, "pglib can only read single dimensional arrays (ndim=%d)",
-                              ntohl(phdr->ndim));
-
-    Py_ssize_t dim = ntohl(phdr->ndim) == 0 ? 0 : ntohl(phdr->dim);
+    ArrayInfo info;
+    if (!ReadArrayInfo(p, info, INT8OID)) {
+        return 0;
+    }
 
-    Object list(PyList_New(dim));
+    Object list(PyList_New(info.len));
     if (!list)
         return 0;
 
-    if (dim > 0)
-    {
-        const char* pT = &phdr->buffer[0];
+    if (info.len) {
+        const char* data = info.data;
 
-        for (int i = 0; i < dim; i++)
+        for (uint32_t i = 0; i < info.len; i++)
         {
-            int32_t len = ntohl(*(int32_t*)pT);
-            pT += 4;
+            int32_t len = Read32(&data);
 
             if (len == -1)
             {
@@ -444,11 +513,11 @@ PyObject* GetInt8Array(const char* p)
             }
             else
             {
-                int64_t val = swapu8(*(uint64_t*)pT);
-                pT += 8;
+                int64_t val = Read64(&data);
                 PyObject* l = PyLong_FromLongLong(val);
                 if (!l)
                     return 0;
+
                 PyList_SET_ITEM(list.Get(), i, l);
             }
         }
@@ -458,28 +527,25 @@ PyObject* GetInt8Array(const char* p)
 }
 
 
+
 PyObject* GetTextArray(const char* p)
 {
-    const ArrayHeader* phdr = (const ArrayHeader*)p;
-
-    if (ntohl(phdr->ndim) > 1)
-        return SetStringError(Error, "pglib can only read single dimensional arrays (ndim=%d)",
-                              ntohl(phdr->ndim));
-
-    Py_ssize_t dim = ntohl(phdr->ndim) == 0 ? 0 : ntohl(phdr->dim);
+    ArrayInfo info;
+    if (!ReadArrayInfo(p, info, TEXTOID)) {
+        return 0;
+    }
 
-    Object list(PyList_New(dim));
+    Object list(PyList_New(info.len));
     if (!list)
         return 0;
 
-    if (dim > 0)
+    if (info.len > 0)
     {
-        const char* pT = &phdr->buffer[0];
+        const char* pT = info.data;
 
-        for (int i = 0; i < dim; i++)
+        for (uint32_t i = 0; i < info.len; i++)
         {
-            int32_t len = ntohl(*(uint32_t*)pT);
-            pT += 4;
+            int32_t len = Read32(&pT);
 
             if (len == -1)
             {
@@ -499,3 +565,50 @@ PyObject* GetTextArray(const char* p)
 
     return list.Detach();
 }
+
+
+PyObject* GetJSONBArray(const char* p) {
+    ArrayInfo info;
+    if (!ReadArrayInfo(p, info, JSONBOID)) {
+        return 0;
+    }
+
+    Object list(PyList_New(info.len));
+    if (!list)
+        return 0;
+
+    if (info.len > 0) {
+        PyObject* func = GetFunction("json.loads");
+        if (!func)
+            return 0;
+
+        const char* data = info.data;
+
+        for (uint32_t i = 0; i < info.len; i++) {
+            // Each element is (len, version (1), cstr)
+
+            int32_t len = Read32(&data);
+
+            PyObject* value = 0;
+            if (len == -1) {
+                value = Py_None;
+                Py_INCREF(Py_None);
+            } else {
+                uint8_t version = ReadU8(&data);
+
+                if (version != 1) {
+                    return SetStringError(Error, "Unexpected JSONB version %u in array", (uint32_t)version);
+                }
+
+                value = PyObject_CallFunction(func, "s", data);
+                if (!value)
+                    return 0;
+                data += len - 1;  // -1 because we already incremented past version
+            }
+
+            PyList_SET_ITEM(list.Get(), i, value);
+        }
+    }
+
+    return list.Detach();
+}

{pglib-5.8.1 → pglib-5.9.0}/src/pgarrays.h

@@ -14,5 +14,6 @@ PyObject* GetInt4Array(const char* p);
 PyObject* GetInt8Array(const char* p);
 PyObject* GetTextArray(const char* p);
 PyObject* GetDateArray(const char* p);
+PyObject* GetJSONBArray(const char* p);
 
 #endif

{pglib-5.8.1 → pglib-5.9.0}/src/pglib.h

@@ -57,7 +57,7 @@ inline void UNUSED(...) { }
 
 extern PyObject* Error;
 
-// From pg_type.h
+// From src/include/catalog/pg_type.dat
 
 #define ANYARRAYOID    2277
 #define ANYOID         2276
@@ -89,6 +89,7 @@ extern PyObject* Error;
 #define VARCHAROID     1043
 #define JSONOID        114
 #define JSONBOID       3802
+#define JSONBARRAYOID  3807
 
 //  #define TIMESTAMPARRAYOID 1115
 //  #define TIMEARRAYOID 1183

{pglib-5.8.1 → pglib-5.9.0}/test/test_sync.py

@@ -1230,6 +1230,16 @@ def test_empty_jsonb(cnxn):
     assert value == result
 
 
+def test_jsonb_array(cnxn):
+    # REVIEW: We can only read these for now.
+    value = [{"a": 1}, {"a": 22}]
+    cnxn.execute("create table t1(j jsonb)")
+    cnxn.execute("""insert into t1 values('{"a": 1}')""")
+    cnxn.execute("""insert into t1 values('{"a": 22}')""")
+
+    result = cnxn.fetchval("select array_agg(j) from t1")
+    assert result == value
+
 def test_info(cnxn):
     info = cnxn.info()
     assert info['dbname'] == 'test'

pglib-5.8.1/pglib/_version.py

@@ -1,484 +0,0 @@
-
-# This file helps to compute a version number in source trees obtained from
-# git-archive tarball (such as those provided by githubs download-from-tag
-# feature). Distribution tarballs (built by setup.py sdist) and build
-# directories (produced by setup.py build) will contain a much shorter file
-# that just contains the computed version number.
-
-# This file is released into the public domain. Generated by
-# versioneer-0.16 (https://github.com/warner/python-versioneer)
-
-"""Git implementation of _version.py."""
-
-import errno
-import os
-import re
-import subprocess
-import sys
-
-
-def get_keywords():
-    """Get the keywords needed to look up the version information."""
-    # these strings will be replaced by git during git-archive.
-    # setup.py/versioneer.py will grep for the variable names, so they must
-    # each be defined on a line of their own. _version.py will just call
-    # get_keywords().
-    git_refnames = "$Format:%d$"
-    git_full = "$Format:%H$"
-    keywords = {"refnames": git_refnames, "full": git_full}
-    return keywords
-
-
-class VersioneerConfig:
-    """Container for Versioneer configuration parameters."""
-
-
-def get_config():
-    """Create, populate and return the VersioneerConfig() object."""
-    # these strings are filled in when 'setup.py versioneer' creates
-    # _version.py
-    cfg = VersioneerConfig()
-    cfg.VCS = "git"
-    cfg.style = "pep440"
-    cfg.tag_prefix = ""
-    cfg.parentdir_prefix = "None"
-    cfg.versionfile_source = "pglib/_version.py"
-    cfg.verbose = False
-    return cfg
-
-
-class NotThisMethod(Exception):
-    """Exception raised if a method is not valid for the current scenario."""
-
-
-LONG_VERSION_PY = {}
-HANDLERS = {}
-
-
-def register_vcs_handler(vcs, method):  # decorator
-    """Decorator to mark a method as the handler for a particular VCS."""
-    def decorate(f):
-        """Store f in HANDLERS[vcs][method]."""
-        if vcs not in HANDLERS:
-            HANDLERS[vcs] = {}
-        HANDLERS[vcs][method] = f
-        return f
-    return decorate
-
-
-def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False):
-    """Call the given command(s)."""
-    assert isinstance(commands, list)
-    p = None
-    for c in commands:
-        try:
-            dispcmd = str([c] + args)
-            # remember shell=False, so use git.cmd on windows, not just git
-            p = subprocess.Popen([c] + args, cwd=cwd, stdout=subprocess.PIPE,
-                                 stderr=(subprocess.PIPE if hide_stderr
-                                         else None))
-            break
-        except EnvironmentError:
-            e = sys.exc_info()[1]
-            if e.errno == errno.ENOENT:
-                continue
-            if verbose:
-                print("unable to run %s" % dispcmd)
-                print(e)
-            return None
-    else:
-        if verbose:
-            print("unable to find command, tried %s" % (commands,))
-        return None
-    stdout = p.communicate()[0].strip()
-    if sys.version_info[0] >= 3:
-        stdout = stdout.decode()
-    if p.returncode != 0:
-        if verbose:
-            print("unable to run %s (error)" % dispcmd)
-        return None
-    return stdout
-
-
-def versions_from_parentdir(parentdir_prefix, root, verbose):
-    """Try to determine the version from the parent directory name.
-
-    Source tarballs conventionally unpack into a directory that includes
-    both the project name and a version string.
-    """
-    dirname = os.path.basename(root)
-    if not dirname.startswith(parentdir_prefix):
-        if verbose:
-            print("guessing rootdir is '%s', but '%s' doesn't start with "
-                  "prefix '%s'" % (root, dirname, parentdir_prefix))
-        raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
-    return {"version": dirname[len(parentdir_prefix):],
-            "full-revisionid": None,
-            "dirty": False, "error": None}
-
-
-@register_vcs_handler("git", "get_keywords")
-def git_get_keywords(versionfile_abs):
-    """Extract version information from the given file."""
-    # the code embedded in _version.py can just fetch the value of these
-    # keywords. When used from setup.py, we don't want to import _version.py,
-    # so we do it with a regexp instead. This function is not used from
-    # _version.py.
-    keywords = {}
-    try:
-        f = open(versionfile_abs, "r")
-        for line in f.readlines():
-            if line.strip().startswith("git_refnames ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["refnames"] = mo.group(1)
-            if line.strip().startswith("git_full ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["full"] = mo.group(1)
-        f.close()
-    except EnvironmentError:
-        pass
-    return keywords
-
-
-@register_vcs_handler("git", "keywords")
-def git_versions_from_keywords(keywords, tag_prefix, verbose):
-    """Get version information from git keywords."""
-    if not keywords:
-        raise NotThisMethod("no keywords at all, weird")
-    refnames = keywords["refnames"].strip()
-    if refnames.startswith("$Format"):
-        if verbose:
-            print("keywords are unexpanded, not using")
-        raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
-    refs = set([r.strip() for r in refnames.strip("()").split(",")])
-    # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
-    # just "foo-1.0". If we see a "tag: " prefix, prefer those.
-    TAG = "tag: "
-    tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)])
-    if not tags:
-        # Either we're using git < 1.8.3, or there really are no tags. We use
-        # a heuristic: assume all version tags have a digit. The old git %d
-        # expansion behaves like git log --decorate=short and strips out the
-        # refs/heads/ and refs/tags/ prefixes that would let us distinguish
-        # between branches and tags. By ignoring refnames without digits, we
-        # filter out many common branch names like "release" and
-        # "stabilization", as well as "HEAD" and "master".
-        tags = set([r for r in refs if re.search(r'\d', r)])
-        if verbose:
-            print("discarding '%s', no digits" % ",".join(refs-tags))
-    if verbose:
-        print("likely tags: %s" % ",".join(sorted(tags)))
-    for ref in sorted(tags):
-        # sorting will prefer e.g. "2.0" over "2.0rc1"
-        if ref.startswith(tag_prefix):
-            r = ref[len(tag_prefix):]
-            if verbose:
-                print("picking %s" % r)
-            return {"version": r,
-                    "full-revisionid": keywords["full"].strip(),
-                    "dirty": False, "error": None
-                    }
-    # no suitable tags, so version is "0+unknown", but full hex is still there
-    if verbose:
-        print("no suitable tags, using unknown + full revision id")
-    return {"version": "0+unknown",
-            "full-revisionid": keywords["full"].strip(),
-            "dirty": False, "error": "no suitable tags"}
-
-
-@register_vcs_handler("git", "pieces_from_vcs")
-def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
-    """Get version from 'git describe' in the root of the source tree.
-
-    This only gets called if the git-archive 'subst' keywords were *not*
-    expanded, and _version.py hasn't already been rewritten with a short
-    version string, meaning we're inside a checked out source tree.
-    """
-    if not os.path.exists(os.path.join(root, ".git")):
-        if verbose:
-            print("no .git in %s" % root)
-        raise NotThisMethod("no .git directory")
-
-    GITS = ["git"]
-    if sys.platform == "win32":
-        GITS = ["git.cmd", "git.exe"]
-    # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
-    # if there isn't one, this yields HEX[-dirty] (no NUM)
-    describe_out = run_command(GITS, ["describe", "--tags", "--dirty",
-                                      "--always", "--long",
-                                      "--match", "%s*" % tag_prefix],
-                               cwd=root)
-    # --long was added in git-1.5.5
-    if describe_out is None:
-        raise NotThisMethod("'git describe' failed")
-    describe_out = describe_out.strip()
-    full_out = run_command(GITS, ["rev-parse", "HEAD"], cwd=root)
-    if full_out is None:
-        raise NotThisMethod("'git rev-parse' failed")
-    full_out = full_out.strip()
-
-    pieces = {}
-    pieces["long"] = full_out
-    pieces["short"] = full_out[:7]  # maybe improved later
-    pieces["error"] = None
-
-    # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty]
-    # TAG might have hyphens.
-    git_describe = describe_out
-
-    # look for -dirty suffix
-    dirty = git_describe.endswith("-dirty")
-    pieces["dirty"] = dirty
-    if dirty:
-        git_describe = git_describe[:git_describe.rindex("-dirty")]
-
-    # now we have TAG-NUM-gHEX or HEX
-
-    if "-" in git_describe:
-        # TAG-NUM-gHEX
-        mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
-        if not mo:
-            # unparseable. Maybe git-describe is misbehaving?
-            pieces["error"] = ("unable to parse git-describe output: '%s'"
-                               % describe_out)
-            return pieces
-
-        # tag
-        full_tag = mo.group(1)
-        if not full_tag.startswith(tag_prefix):
-            if verbose:
-                fmt = "tag '%s' doesn't start with prefix '%s'"
-                print(fmt % (full_tag, tag_prefix))
-            pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
-                               % (full_tag, tag_prefix))
-            return pieces
-        pieces["closest-tag"] = full_tag[len(tag_prefix):]
-
-        # distance: number of commits since tag
-        pieces["distance"] = int(mo.group(2))
-
-        # commit: short hex revision ID
-        pieces["short"] = mo.group(3)
-
-    else:
-        # HEX: no tags
-        pieces["closest-tag"] = None
-        count_out = run_command(GITS, ["rev-list", "HEAD", "--count"],
-                                cwd=root)
-        pieces["distance"] = int(count_out)  # total number of commits
-
-    return pieces
-
-
-def plus_or_dot(pieces):
-    """Return a + if we don't already have one, else return a ."""
-    if "+" in pieces.get("closest-tag", ""):
-        return "."
-    return "+"
-
-
-def render_pep440(pieces):
-    """Build up version string, with post-release "local version identifier".
-
-    Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
-    get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty
-
-    Exceptions:
-    1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty]
-    """
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += plus_or_dot(pieces)
-            rendered += "%d.g%s" % (pieces["distance"], pieces["short"])
-            if pieces["dirty"]:
-                rendered += ".dirty"
-    else:
-        # exception #1
-        rendered = "0+untagged.%d.g%s" % (pieces["distance"],
-                                          pieces["short"])
-        if pieces["dirty"]:
-            rendered += ".dirty"
-    return rendered
-
-
-def render_pep440_pre(pieces):
-    """TAG[.post.devDISTANCE] -- No -dirty.
-
-    Exceptions:
-    1: no tags. 0.post.devDISTANCE
-    """
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"]:
-            rendered += ".post.dev%d" % pieces["distance"]
-    else:
-        # exception #1
-        rendered = "0.post.dev%d" % pieces["distance"]
-    return rendered
-
-
-def render_pep440_post(pieces):
-    """TAG[.postDISTANCE[.dev0]+gHEX] .
-
-    The ".dev0" means dirty. Note that .dev0 sorts backwards
-    (a dirty tree will appear "older" than the corresponding clean one),
-    but you shouldn't be releasing software with -dirty anyways.
-
-    Exceptions:
-    1: no tags. 0.postDISTANCE[.dev0]
-    """
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += ".post%d" % pieces["distance"]
-            if pieces["dirty"]:
-                rendered += ".dev0"
-            rendered += plus_or_dot(pieces)
-            rendered += "g%s" % pieces["short"]
-    else:
-        # exception #1
-        rendered = "0.post%d" % pieces["distance"]
-        if pieces["dirty"]:
-            rendered += ".dev0"
-        rendered += "+g%s" % pieces["short"]
-    return rendered
-
-
-def render_pep440_old(pieces):
-    """TAG[.postDISTANCE[.dev0]] .
-
-    The ".dev0" means dirty.
-
-    Eexceptions:
-    1: no tags. 0.postDISTANCE[.dev0]
-    """
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += ".post%d" % pieces["distance"]
-            if pieces["dirty"]:
-                rendered += ".dev0"
-    else:
-        # exception #1
-        rendered = "0.post%d" % pieces["distance"]
-        if pieces["dirty"]:
-            rendered += ".dev0"
-    return rendered
-
-
-def render_git_describe(pieces):
-    """TAG[-DISTANCE-gHEX][-dirty].
-
-    Like 'git describe --tags --dirty --always'.
-
-    Exceptions:
-    1: no tags. HEX[-dirty]  (note: no 'g' prefix)
-    """
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"]:
-            rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
-    else:
-        # exception #1
-        rendered = pieces["short"]
-    if pieces["dirty"]:
-        rendered += "-dirty"
-    return rendered
-
-
-def render_git_describe_long(pieces):
-    """TAG-DISTANCE-gHEX[-dirty].
-
-    Like 'git describe --tags --dirty --always -long'.
-    The distance/hash is unconditional.
-
-    Exceptions:
-    1: no tags. HEX[-dirty]  (note: no 'g' prefix)
-    """
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
-    else:
-        # exception #1
-        rendered = pieces["short"]
-    if pieces["dirty"]:
-        rendered += "-dirty"
-    return rendered
-
-
-def render(pieces, style):
-    """Render the given version pieces into the requested style."""
-    if pieces["error"]:
-        return {"version": "unknown",
-                "full-revisionid": pieces.get("long"),
-                "dirty": None,
-                "error": pieces["error"]}
-
-    if not style or style == "default":
-        style = "pep440"  # the default
-
-    if style == "pep440":
-        rendered = render_pep440(pieces)
-    elif style == "pep440-pre":
-        rendered = render_pep440_pre(pieces)
-    elif style == "pep440-post":
-        rendered = render_pep440_post(pieces)
-    elif style == "pep440-old":
-        rendered = render_pep440_old(pieces)
-    elif style == "git-describe":
-        rendered = render_git_describe(pieces)
-    elif style == "git-describe-long":
-        rendered = render_git_describe_long(pieces)
-    else:
-        raise ValueError("unknown style '%s'" % style)
-
-    return {"version": rendered, "full-revisionid": pieces["long"],
-            "dirty": pieces["dirty"], "error": None}
-
-
-def get_versions():
-    """Get version information or return default if unable to do so."""
-    # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have
-    # __file__, we can work backwards from there to the root. Some
-    # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which
-    # case we can only use expanded keywords.
-
-    cfg = get_config()
-    verbose = cfg.verbose
-
-    try:
-        return git_versions_from_keywords(get_keywords(), cfg.tag_prefix,
-                                          verbose)
-    except NotThisMethod:
-        pass
-
-    try:
-        root = os.path.realpath(__file__)
-        # versionfile_source is the relative path from the top of the source
-        # tree (where the .git directory might live) to this file. Invert
-        # this to find the root from __file__.
-        for i in cfg.versionfile_source.split('/'):
-            root = os.path.dirname(root)
-    except NameError:
-        return {"version": "0+unknown", "full-revisionid": None,
-                "dirty": None,
-                "error": "unable to find root of source tree"}
-
-    try:
-        pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose)
-        return render(pieces, cfg.style)
-    except NotThisMethod:
-        pass
-
-    try:
-        if cfg.parentdir_prefix:
-            return versions_from_parentdir(cfg.parentdir_prefix, root, verbose)
-    except NotThisMethod:
-        pass
-
-    return {"version": "0+unknown", "full-revisionid": None,
-            "dirty": None,
-            "error": "unable to compute version"}