MIME-Version: 1.0
Sender: azadsalahli@gmail.com
From: =?UTF-8?Q?Azad_Salahl=C4=B1?= <azad.salahli@gmail.com>
Date: Thu, 24 Sep 2020 04:01:46 -0400
Message-ID: 
 <CA+xqhcXzr-iSA5SDsKN5MbgC6i+AM-hRb5Pt+QjSaS20cRgEZg@mail.gmail.com>
Subject: [pgAdmin] Fix incorrect import in setup.py
To: pgadmin-hackers@postgresql.org
Content-Type: multipart/mixed; boundary="000000000000976d0a05b00a9c60"
Precedence: bulk

--000000000000976d0a05b00a9c60
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi,

First time posting here. I've attached a fix for an incorrect import
in `setup.py`. Trying to import from `pgadmin` before adding the root
directory to the system path results in import error, when the script
is invoked in any other way than running it directly. For example

    $ /path/to/venv/bin/pip install pgadmin4
    $ /path/to/venv/bin/python -m pgadmin4.setup
    Traceback (most recent call last):
      ...
      File "/path/to/venv/lib/python3.6/site-packages/pgadmin4/setup.py",
line 18, in <module>
        from pgadmin.model import db, User, Version, ServerGroup, Server, \
    ModuleNotFoundError: No module named 'pgadmin'

Please let me know what you think. Happy to address any feedback.

Regards,
Azad Salahl=C4=B1

--000000000000976d0a05b00a9c60
Content-Type: text/plain; charset="US-ASCII"; name="import_fix.diff"
Content-Disposition: attachment; filename="import_fix.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: file0

ZGlmZiAtLWdpdCBhL3dlYi9zZXR1cC5weSBiL3dlYi9zZXR1cC5weQppbmRleCA0Y2QwOTBkMTUu
LmZiYzdmMWUwNCAxMDA2NDQKLS0tIGEvd2ViL3NldHVwLnB5CisrKyBiL3dlYi9zZXR1cC5weQpA
QCAtMTUsOCArMTUsNiBAQCBpbXBvcnQganNvbgogaW1wb3J0IG9zCiBpbXBvcnQgc3lzCiBpbXBv
cnQgYnVpbHRpbnMKLWZyb20gcGdhZG1pbi5tb2RlbCBpbXBvcnQgZGIsIFVzZXIsIFZlcnNpb24s
IFNlcnZlckdyb3VwLCBTZXJ2ZXIsIFwKLSAgICBTQ0hFTUFfVkVSU0lPTiBhcyBDVVJSRU5UX1ND
SEVNQV9WRVJTSU9OCiAKICMgR3JhYiB0aGUgU0VSVkVSX01PREUgaWYgaXQncyBiZWVuIHNldCBi
eSB0aGUgcnVudGltZQogaWYgJ1NFUlZFUl9NT0RFJyBpbiBnbG9iYWxzKCk6CkBAIC0zMSw2ICsy
OSw4IEBAIGlmIHN5cy5wYXRoWzBdICE9IHJvb3Q6CiAgICAgc3lzLnBhdGguaW5zZXJ0KDAsIHJv
b3QpCiAKIGZyb20gcGdhZG1pbiBpbXBvcnQgY3JlYXRlX2FwcAorZnJvbSBwZ2FkbWluLm1vZGVs
IGltcG9ydCBkYiwgVXNlciwgVmVyc2lvbiwgU2VydmVyR3JvdXAsIFNlcnZlciwgXAorICAgIFND
SEVNQV9WRVJTSU9OIGFzIENVUlJFTlRfU0NIRU1BX1ZFUlNJT04KIAogCiBkZWYgYWRkX3ZhbHVl
KGF0dHJfZGljdCwga2V5LCB2YWx1ZSk6Cg==
--000000000000976d0a05b00a9c60--