original filename for uploads if filename not set

Author: maxtepkeev

CHANGELOG.rst

@@ -20,6 +20,7 @@ Changelog
 - ``dir(resource)`` and ``list(resource)`` now also show properties of an object
 - Support for ``issues_assigned`` and ``issues_authored`` relations in User object
   (`Issue #317 <https://github.com/maxtepkeev/python-redmine/issues/317>`__)
+- Original filename will be used as a filename for all uploaded files if a path was provided and filename wasn't set
 - *Pro Edition:* Added support for RedmineUP DealCategory ``create()``, ``update()``, ``delete()`` operations
   (see `docs <https://python-redmine.com/resources/deal_category.html#create-methods>`__ for details)
 - *Pro Edition:* RedmineUP CrmQuery resource now supports ``invoices`` and ``expenses`` relation attributes

docs/advanced/working_with_files.rst

@@ -29,9 +29,9 @@ Upload
    >>> data
    {'id': 7167, 'token': '7167.ed1ccdb093229ca1bd0b043618d88743'}
 
-If a file-like object is provided, be sure that it contains ``str`` and not ``unicode`` under Python 2, and
-``bytes`` and not ``str`` under Python 3, otherwise Python-Redmine will have to make an additional conversion,
-which will affect performance.
+If a filename isn't specified, Python-Redmine will use the original filename from a path, if any. If a
+file-like object is provided, be sure that it contains ``bytes`` and not ``str``, otherwise Python-Redmine
+will have to make additional conversion, which will affect performance.
 
 Download
 --------

redminelib/__init__.py

@@ -109,10 +109,6 @@ def upload(self, f, filename=None):
         if self.ver is not None and self.ver < (1, 4, 0):
             raise exceptions.VersionMismatchError('File uploading')
 
-        url = f'{self.url}/uploads.json'
-        headers = {'Content-Type': 'application/octet-stream'}
-        params = {'filename': filename or ''}
-
         # There are myriads of file-like object implementations here and there and some of them don't have
         # a "read" method, which is wrong, but that's what we have, on the other hand it looks like all of
         # them implement a "close" method, that's why we check for it here. Also, we don't want to close the
@@ -138,9 +134,16 @@ def upload(self, f, filename=None):
             if not os.path.isfile(f) or os.path.getsize(f) == 0:
                 raise exceptions.NoFileError
 
+            if not filename:
+                filename = os.path.basename(f)
+
             stream = open(f, 'rb')
             close = True
 
+        url = f'{self.url}/uploads.json'
+        headers = {'Content-Type': 'application/octet-stream'}
+        params = {'filename': filename or ''}
+
         response = self.engine.request('post', url, params=params, data=stream, headers=headers)
 
         if close: